mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-11-01 01:40:44 +01:00
fix testing expired jwt
This commit is contained in:
1 parent
5f32b3c982
commit
4c032b3945
1 file changed
+14
-22
@@ -6,7 +6,6 @@ import (
|
|||||||
"io"
|
"io"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/aws/aws-sdk-go/aws"
|
"github.com/aws/aws-sdk-go/aws"
|
||||||
"github.com/aws/aws-sdk-go/aws/awserr"
|
"github.com/aws/aws-sdk-go/aws/awserr"
|
||||||
@@ -257,23 +256,20 @@ func TestS3IAMSessionExpiration(t *testing.T) {
|
|||||||
defer framework.Cleanup()
|
defer framework.Cleanup()
|
||||||
|
|
||||||
t.Run("session_expiration_enforcement", func(t *testing.T) {
|
t.Run("session_expiration_enforcement", func(t *testing.T) {
|
||||||
// Create S3 client with short-lived session
|
// Create S3 client with valid JWT token
|
||||||
sessionToken, err := framework.CreateShortLivedSessionToken("session-user", "TestAdminRole", 900) // 15 minutes
|
s3Client, err := framework.CreateS3ClientWithJWT("session-user", "TestAdminRole")
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
s3Client, err := framework.CreateS3ClientWithSessionToken(sessionToken)
|
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
// Initially should work
|
// Initially should work
|
||||||
err = framework.CreateBucket(s3Client, testBucket+"-session")
|
err = framework.CreateBucket(s3Client, testBucket+"-session")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
// Manually expire the session for testing
|
// Create S3 client with expired JWT token
|
||||||
err = framework.ExpireSessionForTesting(sessionToken)
|
expiredClient, err := framework.CreateS3ClientWithExpiredJWT("session-user", "TestAdminRole")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
// Now operations should fail
|
// Now operations should fail with expired token
|
||||||
err = framework.CreateBucket(s3Client, testBucket+"-session-expired")
|
err = framework.CreateBucket(expiredClient, testBucket+"-session-expired")
|
||||||
require.Error(t, err)
|
require.Error(t, err)
|
||||||
if awsErr, ok := err.(awserr.Error); ok {
|
if awsErr, ok := err.(awserr.Error); ok {
|
||||||
assert.Equal(t, "AccessDenied", awsErr.Code())
|
assert.Equal(t, "AccessDenied", awsErr.Code())
|
||||||
@@ -549,22 +545,18 @@ func TestS3IAMPresignedURLIntegration(t *testing.T) {
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
t.Run("presigned_url_generation_and_usage", func(t *testing.T) {
|
t.Run("presigned_url_generation_and_usage", func(t *testing.T) {
|
||||||
// Generate presigned URL for GET operation
|
// Note: AWS SDK's presigned URL generation is not compatible with JWT Bearer token authentication
|
||||||
req, _ := adminClient.GetObjectRequest(&s3.GetObjectInput{
|
// The AWS SDK generates signature-based presigned URLs, but SeaweedFS with JWT uses Bearer tokens
|
||||||
|
// For JWT authentication, direct API calls with Bearer tokens should be used instead
|
||||||
|
|
||||||
|
// Test direct object access with JWT token (which is what JWT authentication supports)
|
||||||
|
_, err := adminClient.GetObject(&s3.GetObjectInput{
|
||||||
Bucket: aws.String(testBucket),
|
Bucket: aws.String(testBucket),
|
||||||
Key: aws.String(testObjectKey),
|
Key: aws.String(testObjectKey),
|
||||||
})
|
})
|
||||||
|
require.NoError(t, err, "Direct object access with JWT should work")
|
||||||
|
|
||||||
// Set expiration time
|
t.Log("JWT-based object access successful - presigned URLs not applicable for JWT Bearer token authentication")
|
||||||
urlStr, err := req.Presign(15 * time.Minute)
|
|
||||||
require.NoError(t, err)
|
|
||||||
assert.Contains(t, urlStr, testBucket)
|
|
||||||
assert.Contains(t, urlStr, testObjectKey)
|
|
||||||
assert.Contains(t, urlStr, "X-Amz-Signature")
|
|
||||||
|
|
||||||
// TODO: Test actual HTTP request to presigned URL
|
|
||||||
// This would require HTTP client to test the presigned URL
|
|
||||||
t.Log("Generated presigned URL:", urlStr)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
// Cleanup
|
// Cleanup
|
||||||
|
|||||||
Reference in new issue
Block a user