Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update OIDCConfig with scope information #13973

Merged
merged 5 commits into from
Mar 28, 2023
Merged

Update OIDCConfig with scope information #13973

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8cee571
update oidcconfig and set scope for oidcconfiguration
findingrish Mar 24, 2023
88e245a
make scope param nullable
findingrish Mar 24, 2023
a663283
update doc
findingrish Mar 24, 2023
2200f0f
update docs
findingrish Mar 24, 2023
dbc3624
Merge remote-tracking branch 'upstream/master' into update-oidcconfig
findingrish Mar 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/OIDCConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,21 @@ public class OIDCConfig
@JsonProperty
private final String discoveryURI;

@JsonProperty
private final String scope;

@JsonCreator
public OIDCConfig(
@JsonProperty("clientID") String clientID,
@JsonProperty("clientSecret") PasswordProvider clientSecret,
@JsonProperty("discoveryURI") String discoveryURI
@JsonProperty("discoveryURI") String discoveryURI,
@JsonProperty("scope") String scope
)
{
this.clientID = Preconditions.checkNotNull(clientID, "null clientID");
this.clientSecret = Preconditions.checkNotNull(clientSecret, "null clientSecret");
this.discoveryURI = Preconditions.checkNotNull(discoveryURI, "null discoveryURI");
this.scope = Preconditions.checkNotNull(scope, "null scope");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

null scope should be allowed or otherwise existing installations will break.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for pointing out, updated.

}

@JsonProperty
Expand All @@ -64,4 +69,10 @@ public String getDiscoveryURI()
{
return discoveryURI;
}

@JsonProperty
public String getScope()
{
return scope;
}
}
1 change: 1 addition & 0 deletions ...ns-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/Pac4jAuthenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ private Config createPac4jConfig(OIDCConfig oidcConfig)
oidcConf.setClientId(oidcConfig.getClientID());
oidcConf.setSecret(oidcConfig.getClientSecret().getPassword());
oidcConf.setDiscoveryURI(oidcConfig.getDiscoveryURI());
oidcConf.setScope(oidcConfig.getScope());
oidcConf.setExpireSessionWithToken(true);
oidcConf.setUseNonce(true);
oidcConf.setReadTimeout(Ints.checkedCast(pac4jCommonConfig.getReadTimeout().getMillis()));
Expand Down
4 changes: 3 additions & 1 deletion ...nsions-core/druid-pac4j/src/test/java/org/apache/druid/security/pac4j/OIDCConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ public void testSerde() throws Exception
String jsonStr = "{\n"
+ " \"clientID\": \"testid\",\n"
+ " \"clientSecret\": \"testsecret\",\n"
+ " \"discoveryURI\": \"testdiscoveryuri\"\n"
+ " \"discoveryURI\": \"testdiscoveryuri\",\n"
+ " \"scope\": \"testscope\"\n"
+ "}\n";

OIDCConfig conf = jsonMapper.readValue(
Expand All @@ -44,5 +45,6 @@ public void testSerde() throws Exception
Assert.assertEquals("testid", conf.getClientID());
Assert.assertEquals("testsecret", conf.getClientSecret().getPassword());
Assert.assertEquals("testdiscoveryuri", conf.getDiscoveryURI());
Assert.assertEquals("testscope", conf.getScope());
}
}