You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2015/06/18 12:44:57 UTC
svn commit: r1686178 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/spi/security/authentication/SystemSubject.java
test/java/org/apache/jackrabbit/oak/spi/security/authentication/PreAuthTest.java
Author: angela
Date: Thu Jun 18 10:44:57 2015
New Revision: 1686178
URL: http://svn.apache.org/r1686178
Log:
OAK-3006 : Remove workaround added for OAK-1404
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/SystemSubject.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/PreAuthTest.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=1686178&r1=1686177&r2=1686178&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 Thu Jun 18 10:44:57 2015
@@ -22,7 +22,6 @@ 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;
/**
@@ -39,7 +38,6 @@ public final class SystemSubject {
private static Subject createSystemSubject() {
Set<? extends Principal> principals = Collections.singleton(SystemPrincipal.INSTANCE);
- AuthInfo info = new AuthInfoImpl(SystemPrincipal.INSTANCE.getName(), null, principals);
- return new Subject(true, principals, Collections.singleton(info), Collections.<Object>emptySet());
+ return new Subject(true, principals, Collections.<Object>emptySet(), Collections.<Object>emptySet());
}
}
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/PreAuthTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/PreAuthTest.java?rev=1686178&r1=1686177&r2=1686178&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/PreAuthTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/PreAuthTest.java Thu Jun 18 10:44:57 2015
@@ -199,6 +199,31 @@ public class PreAuthTest extends Abstrac
}
}
+ @Test
+ public void testSystemSubject() throws Exception {
+ ContentSession cs = Subject.doAsPrivileged(SystemSubject.INSTANCE, new PrivilegedAction<ContentSession>() {
+ @Override
+ public ContentSession run() {
+ try {
+ return login(null);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+ }, null);
+
+ try {
+ AuthInfo authInfo = cs.getAuthInfo();
+ assertNotSame(AuthInfo.EMPTY, authInfo);
+ assertEquals(SystemSubject.INSTANCE.getPrincipals(), authInfo.getPrincipals());
+ assertEquals(null, authInfo.getUserID());
+ } finally {
+ if (cs != null) {
+ cs.close();
+ }
+ }
+ }
+
private class TestPrincipal implements Principal {
@Override