refactor: Update plugins
Change-Id: I1eadfed6aeaa7ab54a5350582418fde3e93b0e44
Signed-off-by: Baily Robers <Baily.Roberts@boeing.com>
diff --git a/features/org.eclipse.osee.core.server.external.feature/feature.xml b/features/org.eclipse.osee.core.server.external.feature/feature.xml
index c70a8c0..4daf749 100644
--- a/features/org.eclipse.osee.core.server.external.feature/feature.xml
+++ b/features/org.eclipse.osee.core.server.external.feature/feature.xml
@@ -1368,12 +1368,12 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+ <!--
<plugin
id="org.xerial.sqlite"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
+ -->
</feature>
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/OseeOAuthContextProvider.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/OseeOAuthContextProvider.java
index 37bfb82..e3c1bb3 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/OseeOAuthContextProvider.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/OseeOAuthContextProvider.java
@@ -160,7 +160,7 @@
@Override
public boolean isDefault() {
- return permission.isDefault();
+ return permission.isDefaultPermission();
}
@Override
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/OAuthEncryption.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/OAuthEncryption.java
index c9dfa8e..6daf173 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/OAuthEncryption.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/adapters/OAuthEncryption.java
@@ -51,7 +51,8 @@
return encryptCodeGrant(grant, secretKey, null);
}
- private static String encryptCodeGrant(ServerAuthorizationCodeGrant grant, Key secretKey, KeyProperties props) throws SecurityException {
+ private static String encryptCodeGrant(ServerAuthorizationCodeGrant grant, Key secretKey, KeyProperties props)
+ throws SecurityException {
String tokenSequence = tokenizeCodeGrant(grant);
return CryptoUtils.encryptSequence(tokenSequence, secretKey, props);
@@ -102,7 +103,8 @@
return encryptAccessToken(token, secretKey, null);
}
- private static String encryptAccessToken(ServerAccessToken token, Key secretKey, KeyProperties props) throws SecurityException {
+ private static String encryptAccessToken(ServerAccessToken token, Key secretKey, KeyProperties props)
+ throws SecurityException {
String tokenSequence = tokenizeServerToken(token);
return CryptoUtils.encryptSequence(tokenSequence, secretKey, props);
}
@@ -111,7 +113,8 @@
return encryptRefreshToken(refreshToken, secretKey, null);
}
- private static String encryptRefreshToken(RefreshToken token, Key secretKey, KeyProperties props) throws SecurityException {
+ private static String encryptRefreshToken(RefreshToken token, Key secretKey, KeyProperties props)
+ throws SecurityException {
String tokenSequence = tokenizeRefreshToken(token);
return CryptoUtils.encryptSequence(tokenSequence, secretKey, props);
@@ -121,12 +124,14 @@
return decryptCodeGrant(provider, grant, secretKey, null);
}
- private static ServerAuthorizationCodeGrant decryptCodeGrant(OAuthDataProvider provider, String encodedData, Key key, KeyProperties props) throws SecurityException {
+ private static ServerAuthorizationCodeGrant decryptCodeGrant(OAuthDataProvider provider, String encodedData, Key key,
+ KeyProperties props) throws SecurityException {
String decryptedSequence = CryptoUtils.decryptSequence(encodedData, key, props);
return recreateCodeGrant(provider, decryptedSequence);
}
- private static ServerAuthorizationCodeGrant recreateCodeGrant(OAuthDataProvider provider, String decryptedSequence) throws SecurityException {
+ private static ServerAuthorizationCodeGrant recreateCodeGrant(OAuthDataProvider provider, String decryptedSequence)
+ throws SecurityException {
return recreateCodeGrantInternal(provider, decryptedSequence);
}
@@ -204,16 +209,19 @@
return accessToken;
}
- private static ServerAccessToken decryptAccessToken(OAuthDataProvider provider, String encodedData, Key secretKey, KeyProperties props) throws SecurityException {
+ private static ServerAccessToken decryptAccessToken(OAuthDataProvider provider, String encodedData, Key secretKey,
+ KeyProperties props) throws SecurityException {
String decryptedSequence = CryptoUtils.decryptSequence(encodedData, secretKey, props);
return recreateAccessToken(provider, encodedData, decryptedSequence);
}
- private static ServerAccessToken recreateAccessToken(OAuthDataProvider provider, String newTokenKey, String decryptedSequence) throws SecurityException {
+ private static ServerAccessToken recreateAccessToken(OAuthDataProvider provider, String newTokenKey,
+ String decryptedSequence) throws SecurityException {
return recreateAccessToken(provider, newTokenKey, getParts(decryptedSequence));
}
- private static ServerAccessToken recreateAccessToken(OAuthDataProvider provider, String newTokenKey, String[] parts) {
+ private static ServerAccessToken recreateAccessToken(OAuthDataProvider provider, String newTokenKey,
+ String[] parts) {
final ServerAccessToken newToken = new ServerAccessToken(provider.getClient(parts[4]), parts[1],
newTokenKey == null ? parts[0] : newTokenKey, Long.valueOf(parts[2]), Long.valueOf(parts[3])) {
@@ -252,12 +260,14 @@
return decryptRefreshToken(provider, token, secretKey, null);
}
- private static RefreshToken decryptRefreshToken(OAuthDataProvider provider, String encodedData, Key key, KeyProperties props) throws SecurityException {
+ private static RefreshToken decryptRefreshToken(OAuthDataProvider provider, String encodedData, Key key,
+ KeyProperties props) throws SecurityException {
String decryptedSequence = CryptoUtils.decryptSequence(encodedData, key, props);
return recreateRefreshToken(provider, encodedData, decryptedSequence);
}
- private static RefreshToken recreateRefreshToken(OAuthDataProvider provider, String newTokenKey, String decryptedSequence) throws SecurityException {
+ private static RefreshToken recreateRefreshToken(OAuthDataProvider provider, String newTokenKey,
+ String decryptedSequence) throws SecurityException {
String[] parts = getParts(decryptedSequence);
ServerAccessToken token = recreateAccessToken(provider, newTokenKey, parts);
return new RefreshToken(token, newTokenKey, parseSimpleList(parts[parts.length - 1]));
@@ -345,7 +355,7 @@
state.append(tokenizeString(p.getDescription()));
state.append(".");
// 9.3
- state.append(p.isDefault());
+ state.append(p.isDefaultPermission());
state.append(".");
// 9.4
state.append(p.getHttpVerbs().toString());
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/writers/AuthorizationDataHtmlWriter.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/writers/AuthorizationDataHtmlWriter.java
index 2da47cf..e64a317 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/writers/AuthorizationDataHtmlWriter.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/security/oauth2/provider/writers/AuthorizationDataHtmlWriter.java
@@ -97,7 +97,8 @@
private void addItem(InputFields input, OAuthPermission perm) {
String permissionName = perm.getPermission();
String key = String.format("%s_status", permissionName);
- input.add(key, InputType.checkbox, permissionName, perm.getDescription(), "", "allow", perm.isDefault());
+ input.add(key, InputType.checkbox, permissionName, perm.getDescription(), "", "allow",
+ perm.isDefaultPermission());
}
}
diff --git a/plugins/org.eclipse.osee.jaxrs/src/org/eclipse/osee/jaxrs/OAuth2Flows.java b/plugins/org.eclipse.osee.jaxrs/src/org/eclipse/osee/jaxrs/OAuth2Flows.java
index 9dc5b18..c6e6287 100644
--- a/plugins/org.eclipse.osee.jaxrs/src/org/eclipse/osee/jaxrs/OAuth2Flows.java
+++ b/plugins/org.eclipse.osee.jaxrs/src/org/eclipse/osee/jaxrs/OAuth2Flows.java
@@ -76,7 +76,8 @@
return OAuthUtils.generateRandomTokenKey();
}
- public ClientAccessToken authorizationCodeFlow(JaxRsConfirmAccessHandler handler, String state, String scope, String redirectUri) {
+ public ClientAccessToken authorizationCodeFlow(JaxRsConfirmAccessHandler handler, String state, String scope,
+ String redirectUri) {
String sessionCookie = null;
AuthFlowResponse response = requestAuthorizationGrant(state, scope, redirectUri);
if (response.isAuthData()) {
@@ -111,7 +112,7 @@
}
protected AuthFlowResponse requestAuthorizationGrant(String state, String scope, String redirectUri) {
- UriBuilder builder = OAuthClientUtils.getAuthorizationURIBuilder(authorizeUri, client.getKey(), scope);
+ UriBuilder builder = OAuthClientUtils.getAuthorizationURIBuilder(authorizeUri, client.getClientId(), scope);
if (redirectUri != null) {
builder.queryParam(OAuthConstants.REDIRECT_URI, redirectUri);
}
@@ -119,7 +120,7 @@
builder.queryParam(OAuthConstants.STATE, state);
}
// confidential clients
- builder.queryParam(OAuthConstants.CLIENT_SECRET, client.getSecret());
+ builder.queryParam(OAuthConstants.CLIENT_SECRET, client.getClientSecret());
URI authorizationURI = builder.build();
Response response = transport.sendAuthorizationCodeRequest(owner, authorizationURI);
@@ -145,7 +146,8 @@
}
}
- protected AuthFlowResponse confirmAccess(JaxRsConfirmAccessHandler handler, OAuthAuthorizationData authData, String sessionCookie) {
+ protected AuthFlowResponse confirmAccess(JaxRsConfirmAccessHandler handler, OAuthAuthorizationData authData,
+ String sessionCookie) {
ConfirmAccessRequest request = newAccessConfirmRequest(authData);
ConfirmAccessResponse ownerResponse = handler.onConfirmAccess(request);
Form form = newAccessConfirmForm(authData, ownerResponse);
@@ -181,7 +183,8 @@
}
}
- protected ClientAccessToken exchangeCodeForToken(String sessionCookie, String authCode, String state, String scope, String redirectUri) {
+ protected ClientAccessToken exchangeCodeForToken(String sessionCookie, String authCode, String state, String scope,
+ String redirectUri) {
Map<String, String> extraParams = new HashMap<>();
if (state != null) {
extraParams.put(OAuthConstants.STATE, state);
@@ -339,7 +342,7 @@
@Override
public boolean isDefault() {
- return perm.isDefault();
+ return perm.isDefaultPermission();
}
@Override
