Enforce scope claim as authorization bitmask #21

dknoma · 2019-05-30T21:37:26Z

No description provided.

…o ToLongBiFunction to accomodate for a String scopes parameter in resolve. TODO: actually do something with the scopes string. (it is not necessary to auto-resolve a previously unseen scope)

…resent during resolve. if scope bit exists, grabs that bit and | it to the realmBit. else assigns the bit THEN grab and | it to the realmBit. fixed test for it as well to have correct expectedAuthorization

… status code to test for, and if resolve should ignore excess scopes or if that's taken care of beforehand

…cope bit information

…rom implementation to the spec.

… the implementation where tests would hang because of unaccounted for null exceptions

…es check for OAuthNukleus as well.

…gnize 281474976710663 vs. 0x0001_000000000007L. with.roles script passes on its own, but when grouped with the route and stream scripts it fails

…xtraScope test

…cope authorization bits are set, route is set up correctly and authorization seems to be correctly required now

src/main/java/org/reaktivity/nukleus/oauth/internal/OAuthNukleus.java

src/main/java/org/reaktivity/nukleus/oauth/internal/OAuthRealms.java

src/main/java/org/reaktivity/nukleus/oauth/internal/stream/OAuthProxyFactory.java

src/main/java/org/reaktivity/nukleus/oauth/internal/stream/OAuthProxyFactoryBuilder.java

src/test/java/org/reaktivity/nukleus/oauth/internal/control/ControllerIT.java

src/test/java/org/reaktivity/nukleus/oauth/internal/streams/StreamsIT.java

…ver commented code. changed resolveRealm from ToLongBiFunction to ToLongFunction<JsonWebSignature>. Renamed variables and parameters to be more specific.

…an outdated version of lookup() that use different parameters in its signature. keeping old method for now, will need to change.

…ctly call RESOLVE first before executing their scripts allowing the oauth realms to be correctly added. all StreamIT tests are passing.

…use the new lookup() method that uses JsonWebSignature as its lone parameter.

…ealm, should NOT have been adding a reaklm

…uilds correctly as well.

src/main/java/org/reaktivity/nukleus/oauth/internal/OAuthNukleus.java

src/main/java/org/reaktivity/nukleus/oauth/internal/OAuthRealms.java

src/main/java/org/reaktivity/nukleus/oauth/internal/stream/OAuthProxyFactoryBuilder.java

src/main/java/org/reaktivity/nukleus/oauth/internal/OAuthRealms.java

…msTest to use resolve() instead of add() now. StreamIT tests now use the correct format for route/resolve tests.

…et/supplybits and used built-in getOrDefault() and computeIfAbsent() in lookup() and resolve() respectively. better checks if there are too many scopes and reduces redundancy of checking if a scope has its bit set and doing computeIfAbsent().

src/main/java/org/reaktivity/nukleus/oauth/internal/OAuthRealms.java

src/test/java/org/reaktivity/nukleus/oauth/internal/OAuthRealmsTest.java

…way scope bit shifting works. fixed tests as well

…OAuthRealmsTest, newSignedSignature(), to create a new signed signature for testing RESOLVE

src/main/java/org/reaktivity/nukleus/oauth/internal/OAuthRealms.java

…plied change to use this::assignScopeBit in computeIfAbsent

src/main/java/org/reaktivity/nukleus/oauth/internal/OAuthRealms.java

src/main/java/org/reaktivity/nukleus/oauth/internal/stream/OAuthProxyFactoryBuilder.java

src/test/java/org/reaktivity/nukleus/oauth/internal/OAuthRealmsTest.java

…se. fixed imports to be alphabetical

… too.many.realms tests. too many realms or scopes trying to be resolved will end up with NO_AUTHORIZATION (0) due to IllegalStateExceptions. Maybe want to change this later

jfallows

Suggestions to remove need for IllegalStateException in error case.

src/main/java/org/reaktivity/nukleus/oauth/internal/OAuthRealms.java

… will now just make authorization be 0 and instead asserts that if condition rather than throwing the error.

src/main/java/org/reaktivity/nukleus/oauth/internal/OAuthRealms.java

…::newOAuthRealm` to `OAuthRealm::new` and removed `newOAuthRealm` method.

dknoma added 7 commits May 24, 2019 17:06

cloned tests to test scope for oauth2

d898a13

changed resolve() references throughout OAuth from a ToLongFunction t…

387a3a6

…o ToLongBiFunction to accomodate for a String scopes parameter in resolve. TODO: actually do something with the scopes string. (it is not necessary to auto-resolve a previously unseen scope)

lazily assigned bits to the scopes based off of how many scopes are p…

d320adb

…resent during resolve. if scope bit exists, grabs that bit and | it to the realmBit. else assigns the bit THEN grab and | it to the realmBit. fixed test for it as well to have correct expectedAuthorization

cleaned up code. TODO: need to check for scopes length >48, what http…

a3de538

… status code to test for, and if resolve should ignore excess scopes or if that's taken care of beforehand

revised resolve(). no uses an OAuthRealmObject to contain realm and s…

96ab6ff

…cope bit information

removed unnecessary imports from files.

ce5f656

fixed spec test. modular to allow for scopes to be passed as a prop f…

d1bc444

…rom implementation to the spec.

jfallows changed the title ~~For Review~~ Enforce scope claim as authorization bitmask May 31, 2019

dknoma added 7 commits May 31, 2019 10:02

fixed pom.xml. using correct dependencies now. also fixed an error in…

0dc65ae

… the implementation where tests would hang because of unaccounted for null exceptions

passing all StreamsIT and ControllerIT tests. fixed another empty rol…

30d77cf

…es check for OAuthNukleus as well.

working on getting test scripts to work together. doesnt seem to reco…

354c63c

…gnize 281474976710663 vs. 0x0001_000000000007L. with.roles script passes on its own, but when grouped with the route and stream scripts it fails

WithNoSetScopes and WithSetScopes tests are passing. Working on WithE…

e8963bf

…xtraScope test

Working on WithExtraScope tests.

3b47c41

fixed checkstyle. commented out extra scopes test to pass build

2f4ce8b

cleaned up code. extra scopes test should now be passing correctly. s…

f7f6ffb

…cope authorization bits are set, route is set up correctly and authorization seems to be correctly required now

jfallows requested changes Jun 4, 2019

View reviewed changes

dknoma added 7 commits June 4, 2019 10:28

made changes from the requests: removed unnecessary imports and lefto…

9224617

…ver commented code. changed resolveRealm from ToLongBiFunction to ToLongFunction<JsonWebSignature>. Renamed variables and parameters to be more specific.

builds successfully now. Need to change OAuthRealmsTests as they use …

baafabf

…an outdated version of lookup() that use different parameters in its signature. keeping old method for now, will need to change.

Also moved realm assignment from startup to first Resolve. test corre…

941d2a8

…ctly call RESOLVE first before executing their scripts allowing the oauth realms to be correctly added. all StreamIT tests are passing.

commented out test code. need to figure out a way to get the test to …

13e5d8f

…use the new lookup() method that uses JsonWebSignature as its lone parameter.

fixed shouldNotResolveUnkownRealm() test: was accidentally adding a r…

f585e8e

…ealm, should NOT have been adding a reaklm

OAuthRealmsTest now works with the new lookup(). All tests passing, b…

8820539

…uilds correctly as well.

removed commented out code and print statements and TODOs.

23299bf

jfallows requested changes Jun 6, 2019

View reviewed changes

dknoma added 2 commits June 6, 2019 10:58

made fixes to the requested changes. removed add(), changed OAuthReal…

6af563a

…msTest to use resolve() instead of add() now. StreamIT tests now use the correct format for route/resolve tests.

jfallows requested changes Jun 6, 2019

View reviewed changes

dknoma added 2 commits June 6, 2019 16:55

changed the way realm bit shift works to be more consistent with the …

7cfc640

…way scope bit shifting works. fixed tests as well

fixed MAX_SCOPES check in resolve(). also created a helper method in …

017aa7d

…OAuthRealmsTest, newSignedSignature(), to create a new signed signature for testing RESOLVE

jfallows requested changes Jun 7, 2019

View reviewed changes

src/main/java/org/reaktivity/nukleus/oauth/internal/OAuthRealms.java Outdated Show resolved Hide resolved

src/main/java/org/reaktivity/nukleus/oauth/internal/OAuthRealms.java Show resolved Hide resolved

fixed ControllerIT tests to assert the correct authorization bits. ap…

f0e40e0

…plied change to use this::assignScopeBit in computeIfAbsent

jfallows requested changes Jun 7, 2019

View reviewed changes

dknoma added 4 commits June 7, 2019 13:45

changed variable names to be consistent with their function and purpo…

1d1346a

…se. fixed imports to be alphabetical

changed variable names to be consistent with their function and purpo…

29af370

…se. fixed imports to be alphabetical

set up previously unimplemented tests. also created and updated a few…

a5b20ca

… too.many.realms tests. too many realms or scopes trying to be resolved will end up with NO_AUTHORIZATION (0) due to IllegalStateExceptions. Maybe want to change this later

set up previously unimplemented tests. also created and updated a few…

1f71897

… too.many.realms tests. too many realms or scopes trying to be resolved will end up with NO_AUTHORIZATION (0) due to IllegalStateExceptions. Maybe want to change this later

jfallows requested changes Jun 10, 2019

View reviewed changes

src/main/java/org/reaktivity/nukleus/oauth/internal/OAuthRealms.java Outdated Show resolved Hide resolved

removed throwing IllegalStateException. instead of throwing an error,…

eb07cf9

… will now just make authorization be 0 and instead asserts that if condition rather than throwing the error.

jfallows requested changes Jun 10, 2019

View reviewed changes

src/main/java/org/reaktivity/nukleus/oauth/internal/OAuthRealms.java Outdated Show resolved Hide resolved

removed second parameter from OAuthRealm constructor. Changed `this…

5a18aaf

…::newOAuthRealm` to `OAuthRealm::new` and removed `newOAuthRealm` method.

jfallows previously approved these changes Jun 11, 2019

View reviewed changes

Update nukleus-oauth.spec dependency version

c9ee38e

jfallows dismissed their stale review via c9ee38e June 11, 2019 05:36

jfallows approved these changes Jun 11, 2019

View reviewed changes

jfallows merged commit 2de6ffc into reaktivity:develop Jun 11, 2019

This was referenced Jun 11, 2019

Enforce scope claim via authorization bit mask #15

Closed

Defer assigning bit to kid until used by resolve #20

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enforce scope claim as authorization bitmask #21

Enforce scope claim as authorization bitmask #21

dknoma commented May 30, 2019

jfallows left a comment

Enforce scope claim as authorization bitmask #21

Enforce scope claim as authorization bitmask #21

Conversation

dknoma commented May 30, 2019

jfallows left a comment

Choose a reason for hiding this comment