Skip to content

Commit

Permalink
Reintroduce getSnapshot() on AccessMode
Browse files Browse the repository at this point in the history 
- Default subclass implementations creates AccessModeSnapshot
- Static access modes and snapshot return `this`
- Some cleanup of interface code
  • Loading branch information
@henriknyman
henriknyman committed Oct 12, 2016
1 parent 8b246b7 commit 9403729
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 71 deletions.
61 changes: 13 additions & 48 deletions community/kernel/src/main/java/org/neo4j/kernel/api/security/AccessMode.java
View file
Expand Up @@ -53,12 +53,6 @@ public boolean overrideOriginalMode()
{ {
return false; return false;
} }

@Override
public AuthorizationViolationException onViolation( String msg )
{
return new AuthorizationViolationException( msg );
}
}, },


/** No reading or writing allowed because of expired credentials. */ /** No reading or writing allowed because of expired credentials. */
Expand Down Expand Up @@ -132,12 +126,6 @@ public boolean overrideOriginalMode()
{ {
return false; return false;
} }

@Override
public AuthorizationViolationException onViolation( String msg )
{
return new AuthorizationViolationException( msg );
}
}, },


/** Allows writing data */ /** Allows writing data */
Expand Down Expand Up @@ -166,12 +154,6 @@ public boolean overrideOriginalMode()
{ {
return false; return false;
} }

@Override
public AuthorizationViolationException onViolation( String msg )
{
return new AuthorizationViolationException( msg );
}
}, },


/** Allows reading and writing data, but not schema. */ /** Allows reading and writing data, but not schema. */
Expand Down Expand Up @@ -200,12 +182,6 @@ public boolean overrideOriginalMode()
{ {
return false; return false;
} }

@Override
public AuthorizationViolationException onViolation( String msg )
{
return new AuthorizationViolationException( msg );
}
}, },


/** Allows all operations. */ /** Allows all operations. */
Expand Down Expand Up @@ -234,12 +210,6 @@ public boolean overrideOriginalMode()
{ {
return false; return false;
} }

@Override
public AuthorizationViolationException onViolation( String msg )
{
return new AuthorizationViolationException( msg );
}
}, },


/** Allows reading data and schema, but not writing. /** Allows reading data and schema, but not writing.
Expand Down Expand Up @@ -272,12 +242,6 @@ public boolean overrideOriginalMode()
{ {
return true; return true;
} }

@Override
public AuthorizationViolationException onViolation( String msg )
{
return new AuthorizationViolationException( msg );
}
}, },


/** /**
Expand Down Expand Up @@ -311,12 +275,6 @@ public boolean overrideOriginalMode()
{ {
return true; return true;
} }

@Override
public AuthorizationViolationException onViolation( String msg )
{
return new AuthorizationViolationException( msg );
}
}, },


/** /**
Expand Down Expand Up @@ -350,15 +308,20 @@ public boolean overrideOriginalMode()
{ {
return true; return true;
} }
};


@Override @Override
public AuthorizationViolationException onViolation( String msg ) public AuthorizationViolationException onViolation( String msg )
{ {
return new AuthorizationViolationException( msg ); return new AuthorizationViolationException( msg );
} }
},


@Override
public AccessMode getSnapshot()
{
return this;
} }
}


boolean allowsReads(); boolean allowsReads();
boolean allowsWrites(); boolean allowsWrites();
Expand All @@ -376,4 +339,6 @@ default AccessMode getOriginalAccessMode()
{ {
return this; return this;
} }

AccessMode getSnapshot();
} }
33 changes: 11 additions & 22 deletions community/kernel/src/main/java/org/neo4j/kernel/api/security/AuthSubject.java
View file
Expand Up @@ -23,6 +23,7 @@


import org.neo4j.graphdb.security.AuthorizationViolationException; import org.neo4j.graphdb.security.AuthorizationViolationException;
import org.neo4j.kernel.api.exceptions.InvalidArgumentsException; import org.neo4j.kernel.api.exceptions.InvalidArgumentsException;
import org.neo4j.kernel.impl.api.security.AccessModeSnapshot;


public interface AuthSubject extends AccessMode public interface AuthSubject extends AccessMode
{ {
Expand Down Expand Up @@ -54,12 +55,6 @@ public interface AuthSubject extends AccessMode
*/ */
boolean allowsProcedureWith( String[] roleNames ) throws InvalidArgumentsException; boolean allowsProcedureWith( String[] roleNames ) throws InvalidArgumentsException;


/**
* @return A string representing the primary principal of this subject
*/
@Override
String username();

/** /**
* @param username a username * @param username a username
* @return true if the provided username is the underlying user name of this subject * @return true if the provided username is the underlying user name of this subject
Expand All @@ -76,11 +71,17 @@ default void ensureUserExistsWithName( String username ) throws InvalidArguments
throw new InvalidArgumentsException( "User '" + username + "' does not exit." ); throw new InvalidArgumentsException( "User '" + username + "' does not exit." );
} }


abstract class AccessModeAdapter implements AuthSubject @Override
default AccessMode getSnapshot()
{
return AccessModeSnapshot.createAccessModeSnapshot( this );
}

abstract class StaticAccessModeAdapter implements AuthSubject
{ {
private final AccessMode accessMode; private final AccessMode accessMode;


public AccessModeAdapter( AccessMode accessMode ) public StaticAccessModeAdapter( AccessMode.Static accessMode )
{ {
this.accessMode = accessMode; this.accessMode = accessMode;
} }
Expand Down Expand Up @@ -125,7 +126,7 @@ public String name()
/** /**
* Implementation to use when authentication has not yet been performed. Allows nothing. * Implementation to use when authentication has not yet been performed. Allows nothing.
*/ */
AuthSubject ANONYMOUS = new AuthSubject.AccessModeAdapter( Static.NONE ) AuthSubject ANONYMOUS = new StaticAccessModeAdapter( Static.NONE )
{ {
@Override @Override
public void logout() public void logout()
Expand Down Expand Up @@ -167,31 +168,19 @@ public String name()
{ {
return "<anonymous>"; return "<anonymous>";
} }

@Override
public String username()
{
return ""; // Should never clash with a valid username
}
}; };


/** /**
* Implementation to use when authentication is disabled. Allows everything. * Implementation to use when authentication is disabled. Allows everything.
*/ */
AuthSubject AUTH_DISABLED = new AuthSubject.AccessModeAdapter( Static.FULL ) AuthSubject AUTH_DISABLED = new StaticAccessModeAdapter( Static.FULL )
{ {
@Override @Override
public String name() public String name()
{ {
return "<auth disabled>"; return "<auth disabled>";
} }


@Override
public String username()
{
return ""; // Should never clash with a valid username
}

@Override @Override
public void logout() public void logout()
{ {
Expand Down
2 changes: 1 addition & 1 deletion ...unity/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java
View file
Expand Up @@ -231,7 +231,7 @@ public KernelTransactionImplementation initialize(
this.lastTransactionTimestampWhenStarted = lastTimeStamp; this.lastTransactionTimestampWhenStarted = lastTimeStamp;
this.transactionEvent = tracer.beginTransaction(); this.transactionEvent = tracer.beginTransaction();
assert transactionEvent != null : "transactionEvent was null!"; assert transactionEvent != null : "transactionEvent was null!";
this.accessMode = AccessModeSnapshot.createAccessModeSnapshot( accessMode ); this.accessMode = accessMode.getSnapshot();
this.transactionId = NOT_COMMITTED_TRANSACTION_ID; this.transactionId = NOT_COMMITTED_TRANSACTION_ID;
this.commitTime = NOT_COMMITTED_TRANSACTION_COMMIT_TIME; this.commitTime = NOT_COMMITTED_TRANSACTION_COMMIT_TIME;
this.currentTransactionOperations = timeoutMillis > 0 ? operationContainer.guardedParts() : operationContainer.nonGuarderParts(); this.currentTransactionOperations = timeoutMillis > 0 ? operationContainer.guardedParts() : operationContainer.nonGuarderParts();
Expand Down
6 changes: 6 additions & 0 deletions community/kernel/src/main/java/org/neo4j/kernel/impl/api/security/AccessModeSnapshot.java
View file
Expand Up @@ -102,4 +102,10 @@ public AccessMode getOriginalAccessMode()
{ {
return originalMode.getOriginalAccessMode(); return originalMode.getOriginalAccessMode();
} }

@Override
public AccessMode getSnapshot()
{
return this;
}
} }
5 changes: 5 additions & 0 deletions community/kernel/src/main/java/org/neo4j/kernel/impl/api/security/OverriddenAccessMode.java
View file
Expand Up @@ -91,4 +91,9 @@ public AccessMode getOriginalAccessMode()
return originalMode.getOriginalAccessMode(); return originalMode.getOriginalAccessMode();
} }


@Override
public AccessMode getSnapshot()
{
return AccessModeSnapshot.createAccessModeSnapshot( this );
}
} }

0 comments on commit 9403729

Please sign in to comment.