Skip to content

Commit

Permalink
[NCL-1810] Codestyle reformat
Browse files Browse the repository at this point in the history
  • Loading branch information
thescouser89 committed Mar 3, 2020
1 parent 600e4e3 commit f7e0ec6
Show file tree
Hide file tree
Showing 843 changed files with 15,204 additions and 10,539 deletions.
5 changes: 3 additions & 2 deletions auth/src/main/java/org/jboss/pnc/auth/AuthProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@
*/
@Qualifier
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = {ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE})
public @interface AuthProvider {}
@Target(value = { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE })
public @interface AuthProvider {
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
* It will result in 500 status code for requests.
*
*
* Author: Michal Szynkiewicz, [email protected]
* Date: 3/23/16
* Time: 12:32 PM
* Author: Michal Szynkiewicz, [email protected] Date: 3/23/16 Time: 12:32 PM
*/
public class AuthenticationException extends RuntimeException {
public AuthenticationException(String message, Throwable cause) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,29 @@ public class AuthenticationProviderFactory {

private AuthenticationProvider authenticationProvider;

@Deprecated //CDI workaround
@Deprecated // CDI workaround
public AuthenticationProviderFactory() {
}

@Inject
public AuthenticationProviderFactory(@AuthProvider Instance<AuthenticationProvider> providers, Configuration configuration)
throws CoreException {
public AuthenticationProviderFactory(
@AuthProvider Instance<AuthenticationProvider> providers,
Configuration configuration) throws CoreException {

AtomicReference<String> providerId = new AtomicReference<>(null);
try {
providerId.set(configuration.getModuleConfig(new PncConfigProvider<>(SystemConfig.class)).getAuthenticationProviderId());
providerId.set(
configuration.getModuleConfig(new PncConfigProvider<>(SystemConfig.class))
.getAuthenticationProviderId());
} catch (ConfigurationParseException e) {
logger.warn("Unable parse config. Using default scheduler");
providerId.set(DEFAULT_AUTHENTICATION_PROVIDER_ID);
}
providers.forEach(provider -> setMatchingProvider(provider, providerId.get()));
if (authenticationProvider == null) {
throw new CoreException("Cannot get AuthenticationProvider, check configurations and make sure a provider with configured id is available for injection. configured id: " + providerId);
throw new CoreException(
"Cannot get AuthenticationProvider, check configurations and make sure a provider with configured id is available for injection. configured id: "
+ providerId);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class DefaultKeycloakServiceClient implements KeycloakServiceClient {

private Instant expiresAt;

@Deprecated //CDI workaround
@Deprecated // CDI workaround
public DefaultKeycloakServiceClient() {
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@
import javax.servlet.http.HttpServletRequest;

/**
* This class provides access to authenticated user info. In case no authentication
* is configured or there are problems with authentication the default demo-user is
* returned instead
* This class provides access to authenticated user info. In case no authentication is configured or there are problems
* with authentication the default demo-user is returned instead
*
* @author pslegr
* @author <a href="mailto:[email protected]">Matej Lazar</a>
Expand Down
33 changes: 26 additions & 7 deletions auth/src/main/java/org/jboss/pnc/auth/KeycloakClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,29 +36,48 @@
*/
class KeycloakClient {

static AccessTokenResponse getAuthTokensBySecret(String server, String realm, String clientId, String secret, boolean sslRequired) {
static AccessTokenResponse getAuthTokensBySecret(
String server,
String realm,
String clientId,
String secret,
boolean sslRequired) {
return getAuthTokensBySecret(server, realm, null, null, clientId, secret, sslRequired);
}

static AccessTokenResponse getAuthTokensBySecret(String server, String realm, String user, String password, String clientId, String secret, boolean sslRequired) {
static AccessTokenResponse getAuthTokensBySecret(
String server,
String realm,
String user,
String password,
String clientId,
String secret,
boolean sslRequired) {
StringBuilder body = new StringBuilder();
try {
if (user != null) {
if (password == null) {
throw new RuntimeException("No password specified");
}

body.append("client_id=").append(urlencode(clientId))
body.append("client_id=")
.append(urlencode(clientId))
.append("&grant_type=password")
.append("&username=").append(urlencode(user))
.append("&password=").append(urlencode(password));
.append("&username=")
.append(urlencode(user))
.append("&password=")
.append(urlencode(password));
} else {
body.append("grant_type=client_credentials");
}

setSslRequired(sslRequired);
InputStream result = doPost(server + "/realms/" + realm + "/protocol/openid-connect/token",
APPLICATION_FORM_URL_ENCODED, APPLICATION_JSON, body.toString(), BasicAuthHelper.createHeader(clientId, secret));
InputStream result = doPost(
server + "/realms/" + realm + "/protocol/openid-connect/token",
APPLICATION_FORM_URL_ENCODED,
APPLICATION_JSON,
body.toString(),
BasicAuthHelper.createHeader(clientId, secret));
return JsonSerialization.readValue(result, AccessTokenResponse.class);

} catch (UnsupportedEncodingException e) {
Expand Down
11 changes: 6 additions & 5 deletions auth/src/main/java/org/jboss/pnc/auth/KeycloakLoggedInUser.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ public class KeycloakLoggedInUser implements LoggedInUser {

public KeycloakLoggedInUser(HttpServletRequest httpServletRequest) {
try {
KeycloakSecurityContext keycloakSecurityContext = (KeycloakSecurityContext) httpServletRequest.getAttribute(KeycloakSecurityContext.class.getName());
if(keycloakSecurityContext == null) {
KeycloakSecurityContext keycloakSecurityContext = (KeycloakSecurityContext) httpServletRequest
.getAttribute(KeycloakSecurityContext.class.getName());
if (keycloakSecurityContext == null) {
handleAuthenticationProblem("KeycloakSecurityContext not available in the HttpServletRequest.");
} else {
this.auth = keycloakSecurityContext.getToken();
Expand Down Expand Up @@ -88,9 +89,9 @@ public String getTokenString() {

@Override
public String toString() {
return "KeycloakLoggedInUser [auth=" + auth + ", getEmail()=" + getEmail() + ", getUserName()="
+ getUserName() + ", getFirstName()=" + getFirstName() + ", getLastName()=" + getLastName() + ", getRole()="
+ getRole() + ", getTokenString()=***]";
return "KeycloakLoggedInUser [auth=" + auth + ", getEmail()=" + getEmail() + ", getUserName()=" + getUserName()
+ ", getFirstName()=" + getFirstName() + ", getLastName()=" + getLastName() + ", getRole()=" + getRole()
+ ", getTokenString()=***]";
}

private void handleAuthenticationProblem(String warning) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,17 @@ public static void addRealmRoles(String rootUrl, String realm, String auth, Stri
doPostJSON(resourceUrl, auth, roles);
}

public static void addClientRoles(String rootUrl, String realm, String auth, String groupid, String idOfClient, List<?> roles) {
String resourceUrl = composeResourceUrl(rootUrl, realm, "groups/" + groupid + "/role-mappings/clients/" + idOfClient);
public static void addClientRoles(
String rootUrl,
String realm,
String auth,
String groupid,
String idOfClient,
List<?> roles) {
String resourceUrl = composeResourceUrl(
rootUrl,
realm,
"groups/" + groupid + "/role-mappings/clients/" + idOfClient);
doPostJSON(resourceUrl, auth, roles);
}

Expand All @@ -52,8 +61,17 @@ public static void removeRealmRoles(String rootUrl, String realm, String auth, S
doDeleteJSON(resourceUrl, auth, roles);
}

public static void removeClientRoles(String rootUrl, String realm, String auth, String groupid, String idOfClient, List<?> roles) {
String resourceUrl = composeResourceUrl(rootUrl, realm, "groups/" + groupid + "/role-mappings/clients/" + idOfClient);
public static void removeClientRoles(
String rootUrl,
String realm,
String auth,
String groupid,
String idOfClient,
List<?> roles) {
String resourceUrl = composeResourceUrl(
rootUrl,
realm,
"groups/" + groupid + "/role-mappings/clients/" + idOfClient);
doDeleteJSON(resourceUrl, auth, roles);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ public LocalSearch(List<ObjectNode> items) {
this.items = items;
}

public ObjectNode exactMatchOne(String value, String ... attrs) {
public ObjectNode exactMatchOne(String value, String... attrs) {

List<ObjectNode> matched = new LinkedList<>();

for (ObjectNode item: items) {
for (String attr: attrs) {
for (ObjectNode item : items) {
for (String attr : attrs) {
JsonNode node = item.get(attr);
if (node != null && node.asText().equals(value)) {
matched.add(item);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@
*/
public class RoleOperations {

public static class LIST_OF_ROLES extends ArrayList<RoleRepresentation>{}
public static class LIST_OF_ROLES extends ArrayList<RoleRepresentation> {
}

public static class LIST_OF_NODES extends ArrayList<ObjectNode>{}
public static class LIST_OF_NODES extends ArrayList<ObjectNode> {
}

public static String getIdFromRoleName(String adminRoot, String realm, String auth, String rname) {
return getIdForType(adminRoot, realm, auth, "roles", "name", rname);
Expand Down Expand Up @@ -84,7 +86,12 @@ public static List<ObjectNode> getClientRoles(String rootUrl, String realm, Stri
return doGetJSON(LIST_OF_NODES.class, resourceUrl, auth);
}

public static ObjectNode getClientRole(String rootUrl, String realm, String idOfClient, String rolename, String auth) {
public static ObjectNode getClientRole(
String rootUrl,
String realm,
String idOfClient,
String rolename,
String auth) {
String resourceUrl = composeResourceUrl(rootUrl, realm, "clients/" + idOfClient + "/roles/" + rolename);
return doGetJSON(ObjectNode.class, resourceUrl, auth);
}
Expand All @@ -94,63 +101,135 @@ public static List<ObjectNode> getRealmRolesAsNodes(String rootUrl, String realm
return doGetJSON(LIST_OF_NODES.class, resourceUrl, auth);
}

public static List<ObjectNode> getRealmRolesForUserAsNodes(String rootUrl, String realm, String userid, String auth) {
public static List<ObjectNode> getRealmRolesForUserAsNodes(
String rootUrl,
String realm,
String userid,
String auth) {
String resourceUrl = composeResourceUrl(rootUrl, realm, "users/" + userid + "/role-mappings/realm");
return doGetJSON(LIST_OF_NODES.class, resourceUrl, auth);
}

public static List<ObjectNode> getCompositeRealmRolesForUserAsNodes(String rootUrl, String realm, String userid, String auth) {
public static List<ObjectNode> getCompositeRealmRolesForUserAsNodes(
String rootUrl,
String realm,
String userid,
String auth) {
String resourceUrl = composeResourceUrl(rootUrl, realm, "users/" + userid + "/role-mappings/realm/composite");
return doGetJSON(LIST_OF_NODES.class, resourceUrl, auth);
}

public static List<ObjectNode> getAvailableRealmRolesForUserAsNodes(String rootUrl, String realm, String userid, String auth) {
public static List<ObjectNode> getAvailableRealmRolesForUserAsNodes(
String rootUrl,
String realm,
String userid,
String auth) {
String resourceUrl = composeResourceUrl(rootUrl, realm, "users/" + userid + "/role-mappings/realm/available");
return doGetJSON(LIST_OF_NODES.class, resourceUrl, auth);
}

public static List<ObjectNode> getClientRolesForUserAsNodes(String rootUrl, String realm, String userid, String idOfClient, String auth) {
String resourceUrl = composeResourceUrl(rootUrl, realm, "users/" + userid + "/role-mappings/clients/" + idOfClient);
public static List<ObjectNode> getClientRolesForUserAsNodes(
String rootUrl,
String realm,
String userid,
String idOfClient,
String auth) {
String resourceUrl = composeResourceUrl(
rootUrl,
realm,
"users/" + userid + "/role-mappings/clients/" + idOfClient);
return doGetJSON(LIST_OF_NODES.class, resourceUrl, auth);
}

public static List<ObjectNode> getCompositeClientRolesForUserAsNodes(String rootUrl, String realm, String userid, String idOfClient, String auth) {
String resourceUrl = composeResourceUrl(rootUrl, realm, "users/" + userid + "/role-mappings/clients/" + idOfClient + "/composite");
public static List<ObjectNode> getCompositeClientRolesForUserAsNodes(
String rootUrl,
String realm,
String userid,
String idOfClient,
String auth) {
String resourceUrl = composeResourceUrl(
rootUrl,
realm,
"users/" + userid + "/role-mappings/clients/" + idOfClient + "/composite");
return doGetJSON(LIST_OF_NODES.class, resourceUrl, auth);
}

public static List<ObjectNode> getAvailableClientRolesForUserAsNodes(String rootUrl, String realm, String userid, String idOfClient, String auth) {
String resourceUrl = composeResourceUrl(rootUrl, realm, "users/" + userid + "/role-mappings/clients/" + idOfClient + "/available");
public static List<ObjectNode> getAvailableClientRolesForUserAsNodes(
String rootUrl,
String realm,
String userid,
String idOfClient,
String auth) {
String resourceUrl = composeResourceUrl(
rootUrl,
realm,
"users/" + userid + "/role-mappings/clients/" + idOfClient + "/available");
return doGetJSON(LIST_OF_NODES.class, resourceUrl, auth);
}

public static List<ObjectNode> getRealmRolesForGroupAsNodes(String rootUrl, String realm, String groupid, String auth) {
public static List<ObjectNode> getRealmRolesForGroupAsNodes(
String rootUrl,
String realm,
String groupid,
String auth) {
String resourceUrl = composeResourceUrl(rootUrl, realm, "groups/" + groupid + "/role-mappings/realm");
return doGetJSON(LIST_OF_NODES.class, resourceUrl, auth);
}

public static List<ObjectNode> getCompositeRealmRolesForGroupAsNodes(String rootUrl, String realm, String groupid, String auth) {
public static List<ObjectNode> getCompositeRealmRolesForGroupAsNodes(
String rootUrl,
String realm,
String groupid,
String auth) {
String resourceUrl = composeResourceUrl(rootUrl, realm, "groups/" + groupid + "/role-mappings/realm/composite");
return doGetJSON(LIST_OF_NODES.class, resourceUrl, auth);
}

public static List<ObjectNode> getAvailableRealmRolesForGroupAsNodes(String rootUrl, String realm, String groupid, String auth) {
public static List<ObjectNode> getAvailableRealmRolesForGroupAsNodes(
String rootUrl,
String realm,
String groupid,
String auth) {
String resourceUrl = composeResourceUrl(rootUrl, realm, "groups/" + groupid + "/role-mappings/realm/available");
return doGetJSON(LIST_OF_NODES.class, resourceUrl, auth);
}

public static List<ObjectNode> getClientRolesForGroupAsNodes(String rootUrl, String realm, String groupid, String idOfClient, String auth) {
String resourceUrl = composeResourceUrl(rootUrl, realm, "groups/" + groupid + "/role-mappings/clients/" + idOfClient);
public static List<ObjectNode> getClientRolesForGroupAsNodes(
String rootUrl,
String realm,
String groupid,
String idOfClient,
String auth) {
String resourceUrl = composeResourceUrl(
rootUrl,
realm,
"groups/" + groupid + "/role-mappings/clients/" + idOfClient);
return doGetJSON(LIST_OF_NODES.class, resourceUrl, auth);
}

public static List<ObjectNode> getCompositeClientRolesForGroupAsNodes(String rootUrl, String realm, String groupid, String idOfClient, String auth) {
String resourceUrl = composeResourceUrl(rootUrl, realm, "groups/" + groupid + "/role-mappings/clients/" + idOfClient + "/composite");
public static List<ObjectNode> getCompositeClientRolesForGroupAsNodes(
String rootUrl,
String realm,
String groupid,
String idOfClient,
String auth) {
String resourceUrl = composeResourceUrl(
rootUrl,
realm,
"groups/" + groupid + "/role-mappings/clients/" + idOfClient + "/composite");
return doGetJSON(LIST_OF_NODES.class, resourceUrl, auth);
}

public static List<ObjectNode> getAvailableClientRolesForGroupAsNodes(String rootUrl, String realm, String groupid, String idOfClient, String auth) {
String resourceUrl = composeResourceUrl(rootUrl, realm, "groups/" + groupid + "/role-mappings/clients/" + idOfClient + "/available");
public static List<ObjectNode> getAvailableClientRolesForGroupAsNodes(
String rootUrl,
String realm,
String groupid,
String idOfClient,
String auth) {
String resourceUrl = composeResourceUrl(
rootUrl,
realm,
"groups/" + groupid + "/role-mappings/clients/" + idOfClient + "/available");
return doGetJSON(LIST_OF_NODES.class, resourceUrl, auth);
}
}
Loading

0 comments on commit f7e0ec6

Please sign in to comment.