libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

[KEYCLOAK-13385] - Better message when saving a provider with invalid URLs

Browse source
This commit is contained in:
Pedro Igor 2020-03-23 10:38:42 -03:00 committed by Stian Thorgersen
parent b2b790cd1d
commit 1b8369c7d5
4 changed files with 46 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/src/main/java/org/keycloak/common/util/UriUtils.java
View file

@ -104,7 +104,7 @@ public class UriUtils {
String protocol = parsed.getProtocol().toLowerCase(); String protocol = parsed.getProtocol().toLowerCase();
if (!("http".equalsIgnoreCase(protocol) || "https".equalsIgnoreCase(protocol))) { if (!("http".equals(protocol) || "https".equals(protocol))) {
throw new IllegalArgumentException("Invalid protocol/scheme for url [" + name + "]"); throw new IllegalArgumentException("Invalid protocol/scheme for url [" + name + "]");
} }

8
services/src/main/java/org/keycloak/services/resources/admin/IdentityProviderResource.java
View file

@ -165,7 +165,13 @@ public class IdentityProviderResource {
return Response.noContent().build(); return Response.noContent().build();
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
return ErrorResponse.error("Invalid request", BAD_REQUEST); String message = e.getMessage();
if (message == null) {
message = "Invalid request";
}
return ErrorResponse.error(message, BAD_REQUEST);
} catch (ModelDuplicateException e) { } catch (ModelDuplicateException e) {
return ErrorResponse.exists("Identity Provider " + providerRep.getAlias() + " already exists"); return ErrorResponse.exists("Identity Provider " + providerRep.getAlias() + " already exists");
} }

8
services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java
View file

@ -198,7 +198,13 @@ public class IdentityProvidersResource {
return Response.created(session.getContext().getUri().getAbsolutePathBuilder().path(representation.getAlias()).build()).build(); return Response.created(session.getContext().getUri().getAbsolutePathBuilder().path(representation.getAlias()).build()).build();
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
return ErrorResponse.error("Invalid request", BAD_REQUEST); String message = e.getMessage();
if (message == null) {
message = "Invalid request";
}
return ErrorResponse.error(message, BAD_REQUEST);
} catch (ModelDuplicateException e) { } catch (ModelDuplicateException e) {
return ErrorResponse.exists("Identity Provider " + representation.getAlias() + " already exists"); return ErrorResponse.exists("Identity Provider " + representation.getAlias() + " already exists");
} }

36
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IdentityProviderTest.java
View file

@ -36,6 +36,7 @@ import org.keycloak.models.utils.StripSecretsUtils;
import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.OIDCLoginProtocol;
import org.keycloak.representations.idm.AdminEventRepresentation; import org.keycloak.representations.idm.AdminEventRepresentation;
import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.representations.idm.ComponentRepresentation;
import org.keycloak.representations.idm.ErrorRepresentation;
import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; import org.keycloak.representations.idm.IdentityProviderMapperRepresentation;
import org.keycloak.representations.idm.IdentityProviderMapperTypeRepresentation; import org.keycloak.representations.idm.IdentityProviderMapperTypeRepresentation;
import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation;
@ -183,6 +184,8 @@ public class IdentityProviderTest extends AbstractAdminTest {
try (Response response = this.realm.identityProviders().create(newIdentityProvider)) { try (Response response = this.realm.identityProviders().create(newIdentityProvider)) {
assertEquals(AUTH_SERVER_SSL_REQUIRED ? Response.Status.BAD_REQUEST.getStatusCode() : assertEquals(AUTH_SERVER_SSL_REQUIRED ? Response.Status.BAD_REQUEST.getStatusCode() :
Response.Status.CREATED.getStatusCode(), response.getStatus()); Response.Status.CREATED.getStatusCode(), response.getStatus());
ErrorRepresentation error = response.readEntity(ErrorRepresentation.class);
assertEquals("The url [authorization_url] is malformed", error.getErrorMessage());
} }
oidcConfig.setAuthorizationUrl(null); oidcConfig.setAuthorizationUrl(null);
@ -191,6 +194,8 @@ public class IdentityProviderTest extends AbstractAdminTest {
try (Response response = this.realm.identityProviders().create(newIdentityProvider)) { try (Response response = this.realm.identityProviders().create(newIdentityProvider)) {
assertEquals(AUTH_SERVER_SSL_REQUIRED ? Response.Status.BAD_REQUEST.getStatusCode() : assertEquals(AUTH_SERVER_SSL_REQUIRED ? Response.Status.BAD_REQUEST.getStatusCode() :
Response.Status.CREATED.getStatusCode(), response.getStatus()); Response.Status.CREATED.getStatusCode(), response.getStatus());
ErrorRepresentation error = response.readEntity(ErrorRepresentation.class);
assertEquals("The url [token_url] requires secure connections", error.getErrorMessage());
} }
oidcConfig.setAuthorizationUrl(null); oidcConfig.setAuthorizationUrl(null);
@ -200,6 +205,8 @@ public class IdentityProviderTest extends AbstractAdminTest {
try (Response response = this.realm.identityProviders().create(newIdentityProvider)) { try (Response response = this.realm.identityProviders().create(newIdentityProvider)) {
assertEquals(AUTH_SERVER_SSL_REQUIRED ? Response.Status.BAD_REQUEST.getStatusCode() : assertEquals(AUTH_SERVER_SSL_REQUIRED ? Response.Status.BAD_REQUEST.getStatusCode() :
Response.Status.CREATED.getStatusCode(), response.getStatus()); Response.Status.CREATED.getStatusCode(), response.getStatus());
ErrorRepresentation error = response.readEntity(ErrorRepresentation.class);
assertEquals("The url [jwks_url] requires secure connections", error.getErrorMessage());
} }
oidcConfig.setAuthorizationUrl(null); oidcConfig.setAuthorizationUrl(null);
@ -210,6 +217,8 @@ public class IdentityProviderTest extends AbstractAdminTest {
try (Response response = this.realm.identityProviders().create(newIdentityProvider)) { try (Response response = this.realm.identityProviders().create(newIdentityProvider)) {
assertEquals(AUTH_SERVER_SSL_REQUIRED ? Response.Status.BAD_REQUEST.getStatusCode() : assertEquals(AUTH_SERVER_SSL_REQUIRED ? Response.Status.BAD_REQUEST.getStatusCode() :
Response.Status.CREATED.getStatusCode(), response.getStatus()); Response.Status.CREATED.getStatusCode(), response.getStatus());
ErrorRepresentation error = response.readEntity(ErrorRepresentation.class);
assertEquals("The url [logout_url] requires secure connections", error.getErrorMessage());
} }
oidcConfig.setAuthorizationUrl(null); oidcConfig.setAuthorizationUrl(null);
@ -221,6 +230,8 @@ public class IdentityProviderTest extends AbstractAdminTest {
try (Response response = this.realm.identityProviders().create(newIdentityProvider)) { try (Response response = this.realm.identityProviders().create(newIdentityProvider)) {
assertEquals(AUTH_SERVER_SSL_REQUIRED ? Response.Status.BAD_REQUEST.getStatusCode() : assertEquals(AUTH_SERVER_SSL_REQUIRED ? Response.Status.BAD_REQUEST.getStatusCode() :
Response.Status.CREATED.getStatusCode(), response.getStatus()); Response.Status.CREATED.getStatusCode(), response.getStatus());
ErrorRepresentation error = response.readEntity(ErrorRepresentation.class);
assertEquals("The url [userinfo_url] requires secure connections", error.getErrorMessage());
} }
} }
} }
@ -365,7 +376,10 @@ public class IdentityProviderTest extends AbstractAdminTest {
fail("Invalid URL"); fail("Invalid URL");
} catch (Exception e) { } catch (Exception e) {
assertTrue(e instanceof ClientErrorException); assertTrue(e instanceof ClientErrorException);
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), ClientErrorException.class.cast(e).getResponse().getStatus()); Response response = ClientErrorException.class.cast(e).getResponse();
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
ErrorRepresentation error = ((ClientErrorException) e).getResponse().readEntity(ErrorRepresentation.class);
assertEquals("The url [authorization_url] is malformed", error.getErrorMessage());
} }
oidcConfig.setAuthorizationUrl(null); oidcConfig.setAuthorizationUrl(null);
@ -376,7 +390,10 @@ public class IdentityProviderTest extends AbstractAdminTest {
fail("Invalid URL"); fail("Invalid URL");
} catch (Exception e) { } catch (Exception e) {
assertTrue(e instanceof ClientErrorException); assertTrue(e instanceof ClientErrorException);
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), ClientErrorException.class.cast(e).getResponse().getStatus()); Response response = ClientErrorException.class.cast(e).getResponse();
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
ErrorRepresentation error = ((ClientErrorException) e).getResponse().readEntity(ErrorRepresentation.class);
assertEquals("The url [token_url] requires secure connections", error.getErrorMessage());
} }
oidcConfig.setAuthorizationUrl(null); oidcConfig.setAuthorizationUrl(null);
@ -387,7 +404,10 @@ public class IdentityProviderTest extends AbstractAdminTest {
fail("Invalid URL"); fail("Invalid URL");
} catch (Exception e) { } catch (Exception e) {
assertTrue(e instanceof ClientErrorException); assertTrue(e instanceof ClientErrorException);
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), ClientErrorException.class.cast(e).getResponse().getStatus()); Response response = ClientErrorException.class.cast(e).getResponse();
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
ErrorRepresentation error = ((ClientErrorException) e).getResponse().readEntity(ErrorRepresentation.class);
assertEquals("The url [jwks_url] requires secure connections", error.getErrorMessage());
} }
oidcConfig.setAuthorizationUrl(null); oidcConfig.setAuthorizationUrl(null);
@ -399,7 +419,10 @@ public class IdentityProviderTest extends AbstractAdminTest {
fail("Invalid URL"); fail("Invalid URL");
} catch (Exception e) { } catch (Exception e) {
assertTrue(e instanceof ClientErrorException); assertTrue(e instanceof ClientErrorException);
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), ClientErrorException.class.cast(e).getResponse().getStatus()); Response response = ClientErrorException.class.cast(e).getResponse();
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
ErrorRepresentation error = ((ClientErrorException) e).getResponse().readEntity(ErrorRepresentation.class);
assertEquals("The url [logout_url] requires secure connections", error.getErrorMessage());
} }
oidcConfig.setAuthorizationUrl(null); oidcConfig.setAuthorizationUrl(null);
@ -413,7 +436,10 @@ public class IdentityProviderTest extends AbstractAdminTest {
fail("Invalid URL"); fail("Invalid URL");
} catch (Exception e) { } catch (Exception e) {
assertTrue(e instanceof ClientErrorException); assertTrue(e instanceof ClientErrorException);
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), ClientErrorException.class.cast(e).getResponse().getStatus()); Response response = ClientErrorException.class.cast(e).getResponse();
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
ErrorRepresentation error = ((ClientErrorException) e).getResponse().readEntity(ErrorRepresentation.class);
assertEquals("The url [userinfo_url] requires secure connections", error.getErrorMessage());
} }
rau.updateWith(r -> r.setSslRequired(SslRequired.EXTERNAL.name())).update(); rau.updateWith(r -> r.setSslRequired(SslRequired.EXTERNAL.name())).update();