Skip to content

Commit d31c098

Browse files
authored
feat: expose programmatic auth wiring (a2aproject#966)
* feat: expose programmatic auth wiring * Delete userAttributes
1 parent 56f16e9 commit d31c098

3 files changed

Lines changed: 52 additions & 15 deletions

File tree

‎server-common/src/main/java/org/a2aproject/sdk/server/auth/AuthenticatedUser.java‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
11
package org.a2aproject.sdk.server.auth;
22

3+
import org.jspecify.annotations.Nullable;
34
import org.a2aproject.sdk.util.Assert;
45

5-
public record AuthenticatedUser(String username) implements User {
6+
import java.util.Map;
7+
8+
public record AuthenticatedUser(
9+
String username,
10+
Map<String, Object> attributes
11+
) implements User {
12+
13+
public AuthenticatedUser(String username) {
14+
this(username, Map.of());
15+
}
16+
617
public AuthenticatedUser {
718
Assert.checkNotNullParam("username", username);
19+
Assert.checkNotNullParam("attributes", attributes);
20+
attributes = Map.copyOf(attributes);
821
}
922

1023
@Override
@@ -16,4 +29,9 @@ public boolean isAuthenticated() {
1629
public String getUsername() {
1730
return username;
1831
}
32+
33+
@Override
34+
public @Nullable Object getAttribute(String key) {
35+
return attributes.get(key);
36+
}
1937
}

‎server-common/src/main/java/org/a2aproject/sdk/server/requesthandlers/AuthorizationRequestHandlerDecorator.java‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
package org.a2aproject.sdk.server.requesthandlers;
22

3-
import java.util.concurrent.Flow;
4-
import java.util.concurrent.atomic.AtomicBoolean;
5-
63
import jakarta.annotation.PostConstruct;
74
import jakarta.annotation.Priority;
85
import jakarta.decorator.Decorator;
96
import jakarta.decorator.Delegate;
107
import jakarta.enterprise.inject.Any;
118
import jakarta.enterprise.inject.Instance;
129
import jakarta.inject.Inject;
13-
1410
import org.a2aproject.sdk.jsonrpc.common.wrappers.ListTasksResult;
1511
import org.a2aproject.sdk.server.ServerCallContext;
1612
import org.a2aproject.sdk.server.auth.TaskAuthorizationProvider;
13+
import org.a2aproject.sdk.server.auth.TaskOperation;
1714
import org.a2aproject.sdk.spec.A2AError;
1815
import org.a2aproject.sdk.spec.CancelTaskParams;
1916
import org.a2aproject.sdk.spec.DeleteTaskPushNotificationConfigParams;
@@ -32,9 +29,11 @@
3229
import org.a2aproject.sdk.spec.TaskPushNotificationConfig;
3330
import org.a2aproject.sdk.spec.TaskQueryParams;
3431
import org.a2aproject.sdk.spec.TaskStatusUpdateEvent;
35-
import org.a2aproject.sdk.server.auth.TaskOperation;
3632
import org.jspecify.annotations.Nullable;
3733

34+
import java.util.concurrent.Flow;
35+
import java.util.concurrent.atomic.AtomicBoolean;
36+
3837
@Decorator
3938
@Priority(50)
4039
public class AuthorizationRequestHandlerDecorator implements RequestHandler {
@@ -53,7 +52,17 @@ public class AuthorizationRequestHandlerDecorator implements RequestHandler {
5352
public AuthorizationRequestHandlerDecorator() {
5453
}
5554

56-
AuthorizationRequestHandlerDecorator(RequestHandler delegate,
55+
/**
56+
* Creates an authorization decorator programmatically.
57+
*
58+
* <p>This constructor is intended for integrations with
59+
* non-CDI runtimes such as Spring Framework.</p>
60+
*
61+
* @param delegate request handler being protected
62+
* @param authorizationProvider task authorization provider;
63+
* {@code null} disables authorization
64+
*/
65+
public AuthorizationRequestHandlerDecorator(RequestHandler delegate,
5766
@Nullable TaskAuthorizationProvider authorizationProvider) {
5867
this.delegate = delegate;
5968
this.authorizationProvider = authorizationProvider;

‎server-common/src/main/java/org/a2aproject/sdk/server/tasks/InMemoryTaskStore.java‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
package org.a2aproject.sdk.server.tasks;
22

3-
import java.util.Comparator;
4-
import java.util.List;
5-
import java.util.concurrent.ConcurrentHashMap;
6-
import java.util.concurrent.ConcurrentMap;
7-
83
import jakarta.enterprise.context.ApplicationScoped;
94
import jakarta.enterprise.inject.Any;
105
import jakarta.enterprise.inject.Instance;
116
import jakarta.inject.Inject;
12-
137
import org.a2aproject.sdk.jsonrpc.common.wrappers.ListTasksResult;
148
import org.a2aproject.sdk.server.ServerCallContext;
159
import org.a2aproject.sdk.server.auth.TaskAuthorizationProvider;
1610
import org.a2aproject.sdk.server.auth.TaskOperation;
1711
import org.a2aproject.sdk.spec.Artifact;
1812
import org.a2aproject.sdk.spec.ListTasksParams;
1913
import org.a2aproject.sdk.spec.Message;
20-
import org.a2aproject.sdk.util.PageToken;
2114
import org.a2aproject.sdk.spec.Task;
15+
import org.a2aproject.sdk.util.PageToken;
2216
import org.jspecify.annotations.Nullable;
2317

18+
import java.util.Comparator;
19+
import java.util.List;
20+
import java.util.concurrent.ConcurrentHashMap;
21+
import java.util.concurrent.ConcurrentMap;
22+
2423
/**
2524
* In-memory implementation of {@link TaskStore} and {@link TaskStateProvider}.
2625
* <p>
@@ -105,7 +104,18 @@ public InMemoryTaskStore(@Any Instance<TaskAuthorizationProvider> authorizationP
105104
: null;
106105
}
107106

108-
InMemoryTaskStore(@Nullable TaskAuthorizationProvider authorizationProvider) {
107+
/**
108+
* Creates an in-memory task store with optional
109+
* task-level authorization.
110+
*
111+
* <p>This constructor supports programmatic wiring
112+
* in non-CDI runtimes such as Spring Framework.</p>
113+
*
114+
* @param authorizationProvider provider used to filter
115+
* tasks during list operations;
116+
* {@code null} permits all tasks
117+
*/
118+
public InMemoryTaskStore(@Nullable TaskAuthorizationProvider authorizationProvider) {
109119
this.authorizationProvider = authorizationProvider;
110120
}
111121

0 commit comments

Comments
 (0)