099a2d702e<!-- Provide a brief summary of your changes --> ## Motivation and Context <!-- Why is this change needed? What problem does it solve? --> The following PR eliminates duplicate struct definitions by migrating the publisher tool to use canonical types from pkg/model, creating a single source of truth across the codebase. The publisher tool previously had its own copies of structs that were duplicated, ie. ServerJSON, Package, Repository, VersionDetail, EnvironmentVariable, RuntimeArgument and a few others which was not optimal **Changes in the PR:** - Refactored the structs to single canonical types located at pkg/model - Refactor the implementation to use/build canonical structures directly - Remove all duplicate definitions (5 structs eliminated) - Publisher now uses model.ServerJSON, model.Package, model.Repository, etc. - Renamed some of the structs to better reflect their use case, i.e. ServerJSON instead of ServerDetail - Fixes an issue where the Remote property was missing from the previous publisher copy of the Server **Benefits:** - Single source of truth - Schema changes in one place - Type safety - Compiler catches mismatches - Enhanced validation - Field constraints and bson tags - Zero breaking changes - Same CLI interface and JSON output - Future-proof - New canonical fields automatically available Supersedes: #217 and #240 ## How Has This Been Tested? <!-- Have you tested this in a real application? Which scenarios were tested? --> Locally ## Breaking Changes <!-- Will users need to update their code or configurations? --> No ## Types of changes <!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] Documentation update ## Checklist <!-- Go over all the following points, and put an `x` in all the boxes that apply. --> - [ ] I have read the [MCP Documentation](https://modelcontextprotocol.io) - [ ] My code follows the repository's style guidelines - [ ] New and existing tests pass locally - [ ] I have added appropriate error handling - [ ] I have added or updated documentation as needed ## Additional context <!-- Add any other context, implementation notes, or design decisions --> --------- Signed-off-by: Radoslav Dimitrov <radoslav@stacklok.com>
50 lines
1.5 KiB
Go
50 lines
1.5 KiB
Go
package auth_test
|
|
|
|
import (
|
|
"context"
|
|
"crypto/ed25519"
|
|
"crypto/rand"
|
|
"encoding/hex"
|
|
"testing"
|
|
|
|
v0auth "github.com/modelcontextprotocol/registry/internal/api/handlers/v0/auth"
|
|
"github.com/modelcontextprotocol/registry/internal/auth"
|
|
"github.com/modelcontextprotocol/registry/internal/config"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestNoneHandler_GetAnonymousToken(t *testing.T) {
|
|
// Generate a proper Ed25519 seed for testing
|
|
testSeed := make([]byte, ed25519.SeedSize)
|
|
_, err := rand.Read(testSeed)
|
|
require.NoError(t, err)
|
|
|
|
cfg := &config.Config{
|
|
JWTPrivateKey: hex.EncodeToString(testSeed),
|
|
EnableAnonymousAuth: true,
|
|
}
|
|
|
|
handler := v0auth.NewNoneHandler(cfg)
|
|
ctx := context.Background()
|
|
|
|
// Test getting anonymous token
|
|
tokenResponse, err := handler.GetAnonymousToken(ctx)
|
|
require.NoError(t, err)
|
|
assert.NotEmpty(t, tokenResponse.RegistryToken)
|
|
assert.Greater(t, tokenResponse.ExpiresAt, 0)
|
|
|
|
// Validate the token claims
|
|
jwtManager := auth.NewJWTManager(cfg)
|
|
claims, err := jwtManager.ValidateToken(ctx, tokenResponse.RegistryToken)
|
|
require.NoError(t, err)
|
|
|
|
// Check auth method
|
|
assert.Equal(t, auth.MethodNone, claims.AuthMethod)
|
|
assert.Equal(t, "anonymous", claims.AuthMethodSubject)
|
|
|
|
// Check permissions
|
|
require.Len(t, claims.Permissions, 1)
|
|
assert.Equal(t, auth.PermissionActionPublish, claims.Permissions[0].Action)
|
|
assert.Equal(t, "io.modelcontextprotocol.anonymous/*", claims.Permissions[0].ResourcePattern)
|
|
}
|