fix: store tokens in ~/.config/mcp-publisher/ instead of cwd (#1166)
## Summary Fixes #663 - **Security fix**: `mcp-publisher login` no longer writes `.mcpregistry_github_token` and `.mcpregistry_registry_token` to the current working directory. GitHub tokens are kept in memory during the login→exchange flow and cleared immediately after. - **Token location**: Unified token moved from `~/.mcp_publisher_token` to `~/.config/mcp-publisher/token.json` (dir 0700, file 0600), following the convention used by `gh`, `docker`, and `kubectl`. - **Dead code removed**: `NeedsLogin()` was on the `Provider` interface but never called — removed from interface and all 4 implementations. `forceLogin` field also removed. - **Auth tests added**: 11 new tests for `GitHubATProvider` (package previously had 0 tests). - **Test isolation**: `SetupTestToken` now uses `t.TempDir()` + `t.Setenv("HOME", ...)` instead of writing to real `$HOME`. ### Breaking change Users must re-login after upgrading (`mcp-publisher login <method>`). Existing tokens at `~/.mcp_publisher_token` are not auto-migrated. `logout` cleans up both old and new locations. ## Test plan - [x] `make check` passes (lint, unit tests, integration tests) - [x] `mcp-publisher login none` stores token at `~/.config/mcp-publisher/token.json` - [x] No `.mcpregistry_*` files created in cwd after login (with `--token`, `MCP_GITHUB_TOKEN`, or device flow) - [x] `mcp-publisher publish` reads token from new location - [x] `mcp-publisher validate` reads registry URL from new location - [x] `mcp-publisher logout` cleans up new location, legacy `~/.mcp_publisher_token`, and cwd `.mcpregistry_*` files - [x] `mcp-publisher logout` when not logged in shows "Not logged in" - [x] File permissions: dir 0700, file 0600 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
77bbd41fd3
commit
90baa0528f
1 changed files with 556 additions and 203 deletions
|
|
@ -16,15 +16,45 @@ import (
|
|||
)
|
||||
|
||||
const (
|
||||
DefaultRegistryURL = "https://registry.modelcontextprotocol.io"
|
||||
TokenFileName = ".mcp_publisher_token" //nolint:gosec // Not a credential, just a filename
|
||||
MethodGitHub = "github"
|
||||
MethodGitHubOIDC = "github-oidc"
|
||||
MethodDNS = "dns"
|
||||
MethodHTTP = "http"
|
||||
MethodNone = "none"
|
||||
DefaultRegistryURL = "https://registry.modelcontextprotocol.io"
|
||||
LegacyTokenFileName = ".mcp_publisher_token" //nolint:gosec // Not a credential, just a filename
|
||||
MethodGitHub = "github"
|
||||
MethodGitHubOIDC = "github-oidc"
|
||||
MethodDNS = "dns"
|
||||
MethodHTTP = "http"
|
||||
MethodNone = "none"
|
||||
)
|
||||
|
||||
// tokenFilePath returns the path to the token file in the user's config directory
|
||||
// (~/.config/mcp-publisher/token.json). It does not create the directory.
|
||||
func tokenFilePath() (string, error) {
|
||||
homeDir, err := os.UserHomeDir()
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("failed to get home directory: %w", err)
|
||||
}
|
||||
return filepath.Join(homeDir, ".config", "mcp-publisher", "token.json"), nil
|
||||
}
|
||||
|
||||
// notAuthenticatedError returns an error guiding the user to log in,
|
||||
// with a hint about the token location change for users upgrading.
|
||||
func notAuthenticatedError() error {
|
||||
_, _ = fmt.Fprintln(os.Stderr, "hint: token storage moved to ~/.config/mcp-publisher/. If you recently upgraded, please re-login.")
|
||||
return errors.New("not authenticated, run 'mcp-publisher login <method>' first")
|
||||
}
|
||||
|
||||
// ensureTokenDir creates the token directory (~/.config/mcp-publisher/) if needed.
|
||||
func ensureTokenDir() error {
|
||||
homeDir, err := os.UserHomeDir()
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get home directory: %w", err)
|
||||
}
|
||||
dir := filepath.Join(homeDir, ".config", "mcp-publisher")
|
||||
if err := os.MkdirAll(dir, 0700); err != nil {
|
||||
return fmt.Errorf("failed to create config directory: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type CryptoAlgorithm auth.CryptoAlgorithm
|
||||
|
||||
type SignerType string
|
||||
|
|
@ -130,7 +160,7 @@ func createSigner(flags LoginFlags) (auth.Signer, error) {
|
|||
func createAuthProvider(method, registryURL, domain string, token Token, signer auth.Signer) (auth.Provider, error) {
|
||||
switch method {
|
||||
case MethodGitHub:
|
||||
return auth.NewGitHubATProvider(true, registryURL, string(token)), nil
|
||||
return auth.NewGitHubATProvider(registryURL, string(token)), nil
|
||||
case MethodGitHubOIDC:
|
||||
return auth.NewGitHubOIDCProvider(registryURL), nil
|
||||
case MethodDNS:
|
||||
|
|
@ -226,12 +256,15 @@ Examples:
|
|||
return fmt.Errorf("failed to get token: %w", err)
|
||||
}
|
||||
|
||||
homeDir, err := os.UserHomeDir()
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get home directory: %w", err)
|
||||
if err := ensureTokenDir(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
tokenPath, err := tokenFilePath()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
tokenPath := filepath.Join(homeDir, TokenFileName)
|
||||
tokenData := map[string]string{
|
||||
"token": token,
|
||||
"method": method,
|
||||
|
|
|
|||
Loading…
Reference in a new issue