Skip to content

Java11 + @angelusGJ Spring Upgrade #1533

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

Open
theanuradha wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Java11 + @angelusGJ Spring Upgrade #1533

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4de6a9c
Update Spring to 5.1.8.RELEASE and spring-security-oauth2 to 2.3.6.RE…
Jul 10, 2019
ab859ae
Restore java version to 1.8
Jul 10, 2019
4381342
updated to work with java 11
theanuradha Apr 9, 2020
e0c49a3
java 11 branch
theanuradha Apr 9, 2020
8fe754e
java 11 branch
theanuradha Apr 9, 2020
7dc2d47
Merge remote-tracking branch 'angelusGJ/master' into java11
theanuradha Apr 9, 2020
3bf3dd0
java 11 branch
theanuradha Apr 9, 2020
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
Prev Previous commit
Next Next commit
java 11 branch
  • Loading branch information
@theanuradha
theanuradha committed Apr 9, 2020
commit e0c49a3a2f42f9a0db95453f597f84596b5400d5
2 changes: 1 addition & 1 deletion ...ommon/src/main/java/org/mitre/oauth2/service/impl/UriEncodedClientUserDetailsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public UserDetails loadUserByUsername(String clientId) throws UsernameNotFoundE
} else {
throw new UsernameNotFoundException("Client not found: " + clientId);
}
} catch (UnsupportedEncodingException | InvalidClientException e) {
} catch ( InvalidClientException e) {
throw new UsernameNotFoundException("Client not found: " + clientId);
}

Expand Down
17 changes: 2 additions & 15 deletions ...-server/src/main/java/org/mitre/openid/connect/web/DynamicClientRegistrationEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,6 @@ public String registerNewClient(@RequestBody String jsonString, Model m) {
m.addAttribute(HttpCodeView.CODE, HttpStatus.CREATED); // http 201

return ClientInformationResponseView.VIEWNAME;
} catch (UnsupportedEncodingException e) {
logger.error("Unsupported encoding", e);
m.addAttribute(HttpCodeView.CODE, HttpStatus.INTERNAL_SERVER_ERROR);
return HttpCodeView.VIEWNAME;
} catch (IllegalArgumentException e) {
logger.error("Couldn't save client", e);

Expand Down Expand Up @@ -284,7 +280,6 @@ public String readClientConfiguration(@PathVariable("id") String clientId, Model

if (client != null && client.getClientId().equals(auth.getOAuth2Request().getClientId())) {

try {
OAuth2AccessTokenEntity token = rotateRegistrationTokenIfNecessary(auth, client);
RegisteredClient registered = new RegisteredClient(client, token.getValue(), config.getIssuer() + "register/" + UriUtils.encodePathSegment(client.getClientId(), "UTF-8"));

Expand All @@ -293,11 +288,7 @@ public String readClientConfiguration(@PathVariable("id") String clientId, Model
m.addAttribute(HttpCodeView.CODE, HttpStatus.OK); // http 200

return ClientInformationResponseView.VIEWNAME;
} catch (UnsupportedEncodingException e) {
logger.error("Unsupported encoding", e);
m.addAttribute(HttpCodeView.CODE, HttpStatus.INTERNAL_SERVER_ERROR);
return HttpCodeView.VIEWNAME;
}


} else {
// client mismatch
Expand Down Expand Up @@ -382,11 +373,7 @@ public String updateClient(@PathVariable("id") String clientId, @RequestBody Str
m.addAttribute(HttpCodeView.CODE, HttpStatus.OK); // http 200

return ClientInformationResponseView.VIEWNAME;
} catch (UnsupportedEncodingException e) {
logger.error("Unsupported encoding", e);
m.addAttribute(HttpCodeView.CODE, HttpStatus.INTERNAL_SERVER_ERROR);
return HttpCodeView.VIEWNAME;
} catch (IllegalArgumentException e) {
}catch (IllegalArgumentException e) {
logger.error("Couldn't save client", e);

m.addAttribute(JsonErrorView.ERROR, "invalid_client_metadata");
Expand Down
16 changes: 2 additions & 14 deletions ...ver/src/main/java/org/mitre/openid/connect/web/ProtectedResourceRegistrationEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,6 @@ public String registerNewProtectedResource(@RequestBody String jsonString, Model
m.addAttribute(HttpCodeView.CODE, HttpStatus.CREATED); // http 201

return ClientInformationResponseView.VIEWNAME;
} catch (UnsupportedEncodingException e) {
logger.error("Unsupported encoding", e);
m.addAttribute(HttpCodeView.CODE, HttpStatus.INTERNAL_SERVER_ERROR);
return HttpCodeView.VIEWNAME;
} catch (IllegalArgumentException e) {
logger.error("Couldn't save client", e);

Expand Down Expand Up @@ -234,7 +230,7 @@ public String readResourceConfiguration(@PathVariable("id") String clientId, Mod



try {

// possibly update the token
OAuth2AccessTokenEntity token = fetchValidRegistrationToken(auth, client);

Expand All @@ -245,11 +241,7 @@ public String readResourceConfiguration(@PathVariable("id") String clientId, Mod
m.addAttribute(HttpCodeView.CODE, HttpStatus.OK); // http 200

return ClientInformationResponseView.VIEWNAME;
} catch (UnsupportedEncodingException e) {
logger.error("Unsupported encoding", e);
m.addAttribute(HttpCodeView.CODE, HttpStatus.INTERNAL_SERVER_ERROR);
return HttpCodeView.VIEWNAME;
}

} else {
// client mismatch
logger.error("readResourceConfiguration failed, client ID mismatch: "
Expand Down Expand Up @@ -356,10 +348,6 @@ public String updateProtectedResource(@PathVariable("id") String clientId, @Requ
m.addAttribute(HttpCodeView.CODE, HttpStatus.OK); // http 200

return ClientInformationResponseView.VIEWNAME;
} catch (UnsupportedEncodingException e) {
logger.error("Unsupported encoding", e);
m.addAttribute(HttpCodeView.CODE, HttpStatus.INTERNAL_SERVER_ERROR);
return HttpCodeView.VIEWNAME;
} catch (IllegalArgumentException e) {
logger.error("Couldn't save client", e);

Expand Down
Loading