Author: tripod
Date: Fri Feb 7 07:12:14 2014
New Revision: 1565558
URL: http://svn.apache.org/r1565558
Log:
OAK-1404 Pre-Authenticated login does not propagate principals in subject to
AuthInfo class.
- adding workaround for system subject
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/SystemSubject.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/SystemSubject.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/SystemSubject.java?rev=1565558&r1=1565557&r2=1565558&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/SystemSubject.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/SystemSubject.java
Fri Feb 7 07:12:14 2014
@@ -16,9 +16,13 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication;
+import java.security.Principal;
import java.util.Collections;
+import java.util.Set;
+
import javax.security.auth.Subject;
+import org.apache.jackrabbit.oak.api.AuthInfo;
import org.apache.jackrabbit.oak.spi.security.principal.SystemPrincipal;
/**
@@ -34,6 +38,9 @@ public final class SystemSubject {
private SystemSubject() {}
private static Subject createSystemSubject() {
- return new Subject(true,
Collections.singleton(SystemPrincipal.INSTANCE),
Collections.<Object>emptySet(), Collections.<Object>emptySet());
+ // TODO: workaround for OAK-1404
+ Set<? extends Principal> principals =
Collections.singleton(SystemPrincipal.INSTANCE);
+ AuthInfo info = new AuthInfoImpl("system", null, principals);
+ return new Subject(true, principals, Collections.singleton(info),
Collections.<Object>emptySet());
}
}
\ No newline at end of file
