mirror of
https://github.com/J3vb/OwnCord.git
synced 2026-09-03 03:50:00 +03:00
* feat(auth): add revocable API tokens (bot/service auth) Add long-lived, revocable API tokens so headless clients (the introspection MCP tool, bots, CI) can authenticate without a password. Presented as "Authorization: Bearer <token>", a token authenticates as a specific user, inheriting that user's role and permissions. - migration 018 + dedicated api_tokens table (kept separate from sessions so bulk logout and the per-user session cap never touch these); only the SHA-256 hash is stored, raw token shown once at creation - auth.ResolveTokenHash: one shared bearer resolver that both AuthMiddleware and adminAuthMiddleware now call. Sessions are matched first so existing login behavior is unchanged; API tokens are a fallback only on session miss. A DB outage is returned wrapped, never mistaken for a bad token. - `server token create|list|revoke` CLI: mints directly against the DB with no HTTP and no login — the password-free bootstrap path - tests: resolver (8 cases incl. outage-not-fallthrough), db queries (6), api middleware integration (valid + revoked token) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(tools): add owncord-introspect MCP server A local MCP dev tool that lets Claude Code introspect a running OwnCord instance: read its logs, query any REST endpoint, and tail the desktop client's log file. It is a thin wrapper over the existing API plus the client log — no new product surface. - tools/mcp-introspect/index.mjs (Node/ESM, one dep: @modelcontextprotocol/sdk) exposes api_request (full read-write passthrough), server_logs (admin SSE ring-buffer stream), client_logs (reads the desktop log file) - authenticates with an API token (OWNCORD_API_TOKEN); pins the self-signed cert and skips hostname checks (the cert has no SAN) - registered in .mcp.json (secret-free ${OWNCORD_API_TOKEN}) - un-ignore tools/mcp-introspect/ so this shared dev tool is committed, while tools/livekit-server.exe and node_modules stay ignored - docs/mcp-introspect.md: how it works, tool reference, setup, troubleshooting Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(dependencies): update and add various crate versions in Cargo.lock * feat(admin): manage API tokens from the admin panel Add Owner-gated HTTP endpoints and a UI card to create, list, and revoke API tokens from the web admin panel. Previously only the `server token` CLI could manage them, which requires shell access to the host. - POST|GET|DELETE /admin/api/tokens in admin/handlers_tokens.go, wired in admin/api.go. All three are Owner-only (ownerOnlyMiddleware, like backups/updates): an HTTP token-mint endpoint is a network-reachable credential-minting surface, and API tokens deliberately survive password change + bulk logout, so a hijacked admin session must not mint one. - Reuses the same db.*APIToken calls as the CLI; create sources the actor from request context (audits who clicked, not the bound user); the raw token is returned once in the 201 body, never stored. - Add json tags to db.APITokenListItem for snake_case wire consistency. - Admin panel: "API Tokens" nav item + create modal, show-once reveal, revoke confirm in admin/static/index.html. - Tests: 7 in admin/api_test.go (+api_tokens table in the in-memory schema). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * refactor: modernize to Go 1.26 idioms + enable modernize linter Apply `golangci-lint modernize` autofixes across the server and enable the linter in .golangci.yml so these stop re-accumulating (they built up only because modernize was never in the config). Production code: slices.Contains for hand-rolled membership loops (api router, ws origin, db/account, plugin manifest); strings.SplitSeq for allocation-free line/segment iteration (db/migrate, updater, livekit_proxy); strings.Cut (config); fmt.Appendf (dm_handler); min() (event_pruner); any (ws client). Tests: range-over-int, t.Context(), WaitGroup.Go, slices.Sort, maps.Copy, new(expr), interface{}->any. - plugin/manifest.go parent-traversal check applied by hand: modernize skipped it (two conflicting rewrites); used the slices.Contains form. - Removed the now-dead ptr() test helper after newexpr inlined its callers. - Dropped dangling sort imports left by the sort.Slice->slices.Sort rewrite. No behavior change. All four tag variants build, full test suite is green, and golangci-lint (with modernize enabled) reports 0 issues. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
433 lines
15 KiB
Go
433 lines
15 KiB
Go
package api_test
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"net/url"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/owncord/server/auth"
|
|
)
|
|
|
|
// ─── POST /api/v1/auth/verify-totp ──────────────────────────────────────────
|
|
|
|
func TestVerifyTOTP_Success(t *testing.T) {
|
|
database := newAuthTestDB(t)
|
|
limiter := auth.NewRateLimiter()
|
|
router := buildAuthRouter(database, limiter)
|
|
|
|
// Create user with TOTP enabled.
|
|
secret, _ := auth.GenerateTOTPSecret()
|
|
hash, _ := auth.HashPassword("Password1!")
|
|
uid, _ := database.CreateUser(context.Background(), "totpuser", hash, 4)
|
|
_ = database.UpdateUserTOTPSecret(context.Background(), uid, &secret)
|
|
|
|
// Login should return requires_2fa + partial_token.
|
|
rr := postJSON(t, router, "/api/v1/auth/login", map[string]string{
|
|
"username": "totpuser",
|
|
"password": "Password1!",
|
|
})
|
|
if rr.Code != http.StatusOK {
|
|
t.Fatalf("login status = %d, want 200; body = %s", rr.Code, rr.Body.String())
|
|
}
|
|
|
|
var loginResp map[string]any
|
|
_ = json.NewDecoder(rr.Body).Decode(&loginResp)
|
|
if loginResp["requires_2fa"] != true {
|
|
t.Fatal("expected requires_2fa=true in login response")
|
|
}
|
|
partialToken, ok := loginResp["partial_token"].(string)
|
|
if !ok || partialToken == "" {
|
|
t.Fatal("expected non-empty partial_token")
|
|
}
|
|
|
|
// Generate valid TOTP code and verify.
|
|
code, err := auth.GenerateTOTPCode(secret, time.Now().UTC())
|
|
if err != nil {
|
|
t.Fatalf("GenerateTOTPCode: %v", err)
|
|
}
|
|
|
|
rr = postJSONWithToken(t, router, "/api/v1/auth/verify-totp", partialToken,
|
|
map[string]string{"code": code})
|
|
if rr.Code != http.StatusOK {
|
|
t.Errorf("verify-totp status = %d, want 200; body = %s", rr.Code, rr.Body.String())
|
|
}
|
|
|
|
var verifyResp map[string]any
|
|
_ = json.NewDecoder(rr.Body).Decode(&verifyResp)
|
|
if verifyResp["token"] == nil {
|
|
t.Error("verify-totp response missing session token")
|
|
}
|
|
}
|
|
|
|
func TestVerifyTOTP_InvalidCode(t *testing.T) {
|
|
database := newAuthTestDB(t)
|
|
limiter := auth.NewRateLimiter()
|
|
router := buildAuthRouter(database, limiter)
|
|
|
|
secret, _ := auth.GenerateTOTPSecret()
|
|
hash, _ := auth.HashPassword("Password1!")
|
|
uid, _ := database.CreateUser(context.Background(), "totpuser2", hash, 4)
|
|
_ = database.UpdateUserTOTPSecret(context.Background(), uid, &secret)
|
|
|
|
// Login to get partial token.
|
|
rr := postJSON(t, router, "/api/v1/auth/login", map[string]string{
|
|
"username": "totpuser2",
|
|
"password": "Password1!",
|
|
})
|
|
var loginResp map[string]any
|
|
_ = json.NewDecoder(rr.Body).Decode(&loginResp)
|
|
partialToken := loginResp["partial_token"].(string)
|
|
|
|
// Submit wrong code.
|
|
rr = postJSONWithToken(t, router, "/api/v1/auth/verify-totp", partialToken,
|
|
map[string]string{"code": "000000"})
|
|
if rr.Code != http.StatusUnauthorized {
|
|
t.Errorf("verify-totp with bad code: status = %d, want 401", rr.Code)
|
|
}
|
|
}
|
|
|
|
func TestVerifyTOTP_MissingToken(t *testing.T) {
|
|
database := newAuthTestDB(t)
|
|
limiter := auth.NewRateLimiter()
|
|
router := buildAuthRouter(database, limiter)
|
|
|
|
rr := postJSON(t, router, "/api/v1/auth/verify-totp",
|
|
map[string]string{"code": "123456"})
|
|
if rr.Code != http.StatusUnauthorized {
|
|
t.Errorf("verify-totp without token: status = %d, want 401", rr.Code)
|
|
}
|
|
}
|
|
|
|
func TestVerifyTOTP_InvalidPartialToken(t *testing.T) {
|
|
database := newAuthTestDB(t)
|
|
limiter := auth.NewRateLimiter()
|
|
router := buildAuthRouter(database, limiter)
|
|
|
|
rr := postJSONWithToken(t, router, "/api/v1/auth/verify-totp", "bogus-token",
|
|
map[string]string{"code": "123456"})
|
|
if rr.Code != http.StatusUnauthorized {
|
|
t.Errorf("verify-totp with bogus token: status = %d, want 401", rr.Code)
|
|
}
|
|
}
|
|
|
|
func TestVerifyTOTP_MalformedBody(t *testing.T) {
|
|
database := newAuthTestDB(t)
|
|
limiter := auth.NewRateLimiter()
|
|
router := buildAuthRouter(database, limiter)
|
|
|
|
// Need a valid partial token to get past the token check.
|
|
secret, _ := auth.GenerateTOTPSecret()
|
|
hash, _ := auth.HashPassword("Password1!")
|
|
uid, _ := database.CreateUser(context.Background(), "totpuser3", hash, 4)
|
|
_ = database.UpdateUserTOTPSecret(context.Background(), uid, &secret)
|
|
|
|
rr := postJSON(t, router, "/api/v1/auth/login", map[string]string{
|
|
"username": "totpuser3",
|
|
"password": "Password1!",
|
|
})
|
|
var loginResp map[string]any
|
|
_ = json.NewDecoder(rr.Body).Decode(&loginResp)
|
|
partialToken := loginResp["partial_token"].(string)
|
|
|
|
// Send invalid JSON.
|
|
req := httptest.NewRequest(http.MethodPost, "/api/v1/auth/verify-totp",
|
|
bytes.NewReader([]byte("{invalid")))
|
|
req.Header.Set("Content-Type", "application/json")
|
|
req.Header.Set("Authorization", "Bearer "+partialToken)
|
|
req.RemoteAddr = "127.0.0.1:9999"
|
|
rec := httptest.NewRecorder()
|
|
router.ServeHTTP(rec, req)
|
|
|
|
if rec.Code != http.StatusBadRequest {
|
|
t.Errorf("verify-totp with malformed body: status = %d, want 400", rec.Code)
|
|
}
|
|
}
|
|
|
|
func TestVerifyTOTP_ReplayProtection(t *testing.T) {
|
|
database := newAuthTestDB(t)
|
|
limiter := auth.NewRateLimiter()
|
|
router := buildAuthRouter(database, limiter)
|
|
|
|
secret, _ := auth.GenerateTOTPSecret()
|
|
hash, _ := auth.HashPassword("Password1!")
|
|
uid, _ := database.CreateUser(context.Background(), "totpuser4", hash, 4)
|
|
_ = database.UpdateUserTOTPSecret(context.Background(), uid, &secret)
|
|
|
|
code, _ := auth.GenerateTOTPCode(secret, time.Now().UTC())
|
|
|
|
// First login + verify — should succeed.
|
|
rr := postJSON(t, router, "/api/v1/auth/login", map[string]string{
|
|
"username": "totpuser4",
|
|
"password": "Password1!",
|
|
})
|
|
var resp1 map[string]any
|
|
_ = json.NewDecoder(rr.Body).Decode(&resp1)
|
|
token1 := resp1["partial_token"].(string)
|
|
|
|
rr = postJSONWithToken(t, router, "/api/v1/auth/verify-totp", token1,
|
|
map[string]string{"code": code})
|
|
if rr.Code != http.StatusOK {
|
|
t.Fatalf("first verify: status = %d, want 200", rr.Code)
|
|
}
|
|
|
|
// Second login + verify with same code — should fail (consumed token).
|
|
rr = postJSON(t, router, "/api/v1/auth/login", map[string]string{
|
|
"username": "totpuser4",
|
|
"password": "Password1!",
|
|
})
|
|
var resp2 map[string]any
|
|
_ = json.NewDecoder(rr.Body).Decode(&resp2)
|
|
token2 := resp2["partial_token"].(string)
|
|
|
|
rr = postJSONWithToken(t, router, "/api/v1/auth/verify-totp", token2,
|
|
map[string]string{"code": code})
|
|
// Code was already used in UsedTOTPCodeStore, so it should be rejected.
|
|
if rr.Code != http.StatusUnauthorized {
|
|
t.Errorf("replay code: status = %d, want 401", rr.Code)
|
|
}
|
|
}
|
|
|
|
// ─── POST /api/v1/users/me/totp/enable ──────────────────────────────────────
|
|
|
|
func TestEnableTOTP_Success(t *testing.T) {
|
|
database := newAuthTestDB(t)
|
|
limiter := auth.NewRateLimiter()
|
|
router := buildAuthRouter(database, limiter)
|
|
|
|
token := loginAndGetToken(t, router, database, "enableuser", 4)
|
|
|
|
rr := postJSONWithToken(t, router, "/api/v1/users/me/totp/enable", token,
|
|
map[string]string{"password": "Password1!"})
|
|
if rr.Code != http.StatusOK {
|
|
t.Errorf("enable-totp status = %d, want 200; body = %s", rr.Code, rr.Body.String())
|
|
}
|
|
|
|
var resp map[string]any
|
|
_ = json.NewDecoder(rr.Body).Decode(&resp)
|
|
if resp["qr_uri"] == nil || resp["qr_uri"] == "" {
|
|
t.Error("enable-totp response missing qr_uri")
|
|
}
|
|
}
|
|
|
|
func TestEnableTOTP_WrongPassword(t *testing.T) {
|
|
database := newAuthTestDB(t)
|
|
limiter := auth.NewRateLimiter()
|
|
router := buildAuthRouter(database, limiter)
|
|
|
|
token := loginAndGetToken(t, router, database, "enableuser2", 4)
|
|
|
|
rr := postJSONWithToken(t, router, "/api/v1/users/me/totp/enable", token,
|
|
map[string]string{"password": "wrongpassword"})
|
|
if rr.Code != http.StatusBadRequest {
|
|
t.Errorf("enable-totp with wrong password: status = %d, want 400", rr.Code)
|
|
}
|
|
}
|
|
|
|
func TestEnableTOTP_Unauthenticated(t *testing.T) {
|
|
database := newAuthTestDB(t)
|
|
limiter := auth.NewRateLimiter()
|
|
router := buildAuthRouter(database, limiter)
|
|
|
|
rr := postJSONWithToken(t, router, "/api/v1/users/me/totp/enable", "badtoken",
|
|
map[string]string{"password": "Password1!"})
|
|
if rr.Code != http.StatusUnauthorized {
|
|
t.Errorf("enable-totp unauthenticated: status = %d, want 401", rr.Code)
|
|
}
|
|
}
|
|
|
|
// ─── POST /api/v1/users/me/totp/confirm ─────────────────────────────────────
|
|
|
|
func TestConfirmTOTP_Success(t *testing.T) {
|
|
database := newAuthTestDB(t)
|
|
limiter := auth.NewRateLimiter()
|
|
router := buildAuthRouter(database, limiter)
|
|
|
|
token := loginAndGetToken(t, router, database, "confirmuser", 4)
|
|
|
|
// Step 1: Enable to get pending secret.
|
|
rr := postJSONWithToken(t, router, "/api/v1/users/me/totp/enable", token,
|
|
map[string]string{"password": "Password1!"})
|
|
if rr.Code != http.StatusOK {
|
|
t.Fatalf("enable: status = %d; body = %s", rr.Code, rr.Body.String())
|
|
}
|
|
|
|
var enableResp map[string]any
|
|
_ = json.NewDecoder(rr.Body).Decode(&enableResp)
|
|
qrURI, _ := enableResp["qr_uri"].(string)
|
|
|
|
// Extract secret from QR URI (otpauth://totp/...?secret=XXX&...)
|
|
secret := extractSecretFromURI(t, qrURI)
|
|
|
|
// Step 2: Generate valid code and confirm.
|
|
code, _ := auth.GenerateTOTPCode(secret, time.Now().UTC())
|
|
rr = postJSONWithToken(t, router, "/api/v1/users/me/totp/confirm", token,
|
|
map[string]string{"password": "Password1!", "code": code})
|
|
if rr.Code != http.StatusNoContent {
|
|
t.Errorf("confirm-totp: status = %d, want 204; body = %s", rr.Code, rr.Body.String())
|
|
}
|
|
|
|
// Verify TOTP is now stored on user.
|
|
user, _ := database.GetUserByUsername(context.Background(), "confirmuser")
|
|
if user == nil {
|
|
t.Fatal("user not found after confirm")
|
|
}
|
|
if user.TOTPSecret == nil {
|
|
t.Error("expected TOTPSecret to be set after confirm")
|
|
}
|
|
}
|
|
|
|
func TestConfirmTOTP_InvalidCode_Handler(t *testing.T) {
|
|
database := newAuthTestDB(t)
|
|
limiter := auth.NewRateLimiter()
|
|
router := buildAuthRouter(database, limiter)
|
|
|
|
token := loginAndGetToken(t, router, database, "confirmuser2", 4)
|
|
|
|
// Enable first.
|
|
postJSONWithToken(t, router, "/api/v1/users/me/totp/enable", token,
|
|
map[string]string{"password": "Password1!"})
|
|
|
|
// Confirm with wrong code.
|
|
rr := postJSONWithToken(t, router, "/api/v1/users/me/totp/confirm", token,
|
|
map[string]string{"password": "Password1!", "code": "000000"})
|
|
if rr.Code != http.StatusUnauthorized {
|
|
t.Errorf("confirm-totp with bad code: status = %d, want 401", rr.Code)
|
|
}
|
|
}
|
|
|
|
func TestConfirmTOTP_NoPendingEnrollment(t *testing.T) {
|
|
database := newAuthTestDB(t)
|
|
limiter := auth.NewRateLimiter()
|
|
router := buildAuthRouter(database, limiter)
|
|
|
|
token := loginAndGetToken(t, router, database, "confirmuser3", 4)
|
|
|
|
// Try to confirm without enable first.
|
|
rr := postJSONWithToken(t, router, "/api/v1/users/me/totp/confirm", token,
|
|
map[string]string{"password": "Password1!", "code": "123456"})
|
|
if rr.Code != http.StatusBadRequest {
|
|
t.Errorf("confirm-totp without enable: status = %d, want 400", rr.Code)
|
|
}
|
|
}
|
|
|
|
func TestConfirmTOTP_WrongPassword_Handler(t *testing.T) {
|
|
database := newAuthTestDB(t)
|
|
limiter := auth.NewRateLimiter()
|
|
router := buildAuthRouter(database, limiter)
|
|
|
|
token := loginAndGetToken(t, router, database, "confirmuser4", 4)
|
|
|
|
postJSONWithToken(t, router, "/api/v1/users/me/totp/enable", token,
|
|
map[string]string{"password": "Password1!"})
|
|
|
|
rr := postJSONWithToken(t, router, "/api/v1/users/me/totp/confirm", token,
|
|
map[string]string{"password": "wrong", "code": "123456"})
|
|
if rr.Code != http.StatusBadRequest {
|
|
t.Errorf("confirm-totp wrong password: status = %d, want 400", rr.Code)
|
|
}
|
|
}
|
|
|
|
// ─── DELETE /api/v1/users/me/totp ────────────────────────────────────────────
|
|
|
|
func TestDisableTOTP_Success(t *testing.T) {
|
|
database := newAuthTestDB(t)
|
|
limiter := auth.NewRateLimiter()
|
|
router := buildAuthRouter(database, limiter)
|
|
|
|
token := loginAndGetToken(t, router, database, "disableuser", 4)
|
|
|
|
// Enable and confirm TOTP first.
|
|
rr := postJSONWithToken(t, router, "/api/v1/users/me/totp/enable", token,
|
|
map[string]string{"password": "Password1!"})
|
|
var enableResp map[string]any
|
|
_ = json.NewDecoder(rr.Body).Decode(&enableResp)
|
|
secret := extractSecretFromURI(t, enableResp["qr_uri"].(string))
|
|
code, _ := auth.GenerateTOTPCode(secret, time.Now().UTC())
|
|
postJSONWithToken(t, router, "/api/v1/users/me/totp/confirm", token,
|
|
map[string]string{"password": "Password1!", "code": code})
|
|
|
|
// Now disable.
|
|
rr = deleteWithToken(t, router, "/api/v1/users/me/totp", token,
|
|
map[string]string{"password": "Password1!"})
|
|
if rr.Code != http.StatusNoContent {
|
|
t.Errorf("disable-totp: status = %d, want 204; body = %s", rr.Code, rr.Body.String())
|
|
}
|
|
}
|
|
|
|
func TestDisableTOTP_WrongPassword_Handler(t *testing.T) {
|
|
database := newAuthTestDB(t)
|
|
limiter := auth.NewRateLimiter()
|
|
router := buildAuthRouter(database, limiter)
|
|
|
|
token := loginAndGetToken(t, router, database, "disableuser2", 4)
|
|
|
|
rr := deleteWithToken(t, router, "/api/v1/users/me/totp", token,
|
|
map[string]string{"password": "wrong"})
|
|
if rr.Code != http.StatusBadRequest {
|
|
t.Errorf("disable-totp wrong password: status = %d, want 400", rr.Code)
|
|
}
|
|
}
|
|
|
|
func TestDisableTOTP_Unauthenticated(t *testing.T) {
|
|
database := newAuthTestDB(t)
|
|
limiter := auth.NewRateLimiter()
|
|
router := buildAuthRouter(database, limiter)
|
|
|
|
rr := deleteWithToken(t, router, "/api/v1/users/me/totp", "badtoken",
|
|
map[string]string{"password": "Password1!"})
|
|
if rr.Code != http.StatusUnauthorized {
|
|
t.Errorf("disable-totp unauthenticated: status = %d, want 401", rr.Code)
|
|
}
|
|
}
|
|
|
|
func TestDisableTOTP_BlockedByServerPolicy(t *testing.T) {
|
|
database := newAuthTestDB(t)
|
|
limiter := auth.NewRateLimiter()
|
|
router := buildAuthRouter(database, limiter)
|
|
|
|
token := loginAndGetToken(t, router, database, "disableuser3", 4)
|
|
|
|
// Enable require_2fa server policy.
|
|
_, _ = database.ExecContext(context.Background(), `INSERT OR REPLACE INTO settings (key, value) VALUES ('require_2fa', '1')`)
|
|
|
|
rr := deleteWithToken(t, router, "/api/v1/users/me/totp", token,
|
|
map[string]string{"password": "Password1!"})
|
|
if rr.Code != http.StatusForbidden {
|
|
t.Errorf("disable-totp with require_2fa: status = %d, want 403; body = %s", rr.Code, rr.Body.String())
|
|
}
|
|
}
|
|
|
|
// ─── Helpers ─────────────────────────────────────────────────────────────────
|
|
|
|
// deleteWithToken sends a DELETE request with a JSON body and auth token.
|
|
func deleteWithToken(t *testing.T, router http.Handler, path, token string, body any) *httptest.ResponseRecorder {
|
|
t.Helper()
|
|
raw, _ := json.Marshal(body)
|
|
req := httptest.NewRequest(http.MethodDelete, path, bytes.NewReader(raw))
|
|
req.Header.Set("Content-Type", "application/json")
|
|
req.Header.Set("Authorization", "Bearer "+token)
|
|
req.RemoteAddr = "127.0.0.1:9999"
|
|
rr := httptest.NewRecorder()
|
|
router.ServeHTTP(rr, req)
|
|
return rr
|
|
}
|
|
|
|
// extractSecretFromURI parses a TOTP otpauth:// URI and returns the secret parameter.
|
|
func extractSecretFromURI(t *testing.T, uri string) string {
|
|
t.Helper()
|
|
u, err := url.Parse(uri)
|
|
if err != nil {
|
|
t.Fatalf("parse otpauth URI: %v", err)
|
|
}
|
|
s := u.Query().Get("secret")
|
|
if s == "" {
|
|
t.Fatalf("no secret param in URI: %s", uri)
|
|
}
|
|
return s
|
|
}
|