diff --git a/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java index 243479a7e4..3346371e48 100755 --- a/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java @@ -61,8 +61,8 @@ public class RealmRepresentation { protected String accountTheme; protected String adminTheme; protected String emailTheme; - protected boolean eventsEnabled; - protected long eventsExpiration; + protected Boolean eventsEnabled; + protected Long eventsExpiration; protected List eventsListeners; public String getId() { @@ -445,7 +445,7 @@ public class RealmRepresentation { this.failureFactor = failureFactor; } - public boolean isEventsEnabled() { + public Boolean isEventsEnabled() { return eventsEnabled; } @@ -453,7 +453,7 @@ public class RealmRepresentation { this.eventsEnabled = eventsEnabled; } - public long getEventsExpiration() { + public Long getEventsExpiration() { return eventsExpiration; } diff --git a/core/src/main/java/org/keycloak/util/UriUtils.java b/core/src/main/java/org/keycloak/util/UriUtils.java index 8532c5b630..3f0f9afa62 100644 --- a/core/src/main/java/org/keycloak/util/UriUtils.java +++ b/core/src/main/java/org/keycloak/util/UriUtils.java @@ -8,7 +8,7 @@ import java.util.regex.Pattern; */ public class UriUtils { - private static final Pattern originPattern = Pattern.compile("(http://|https://)[\\w]+(\\.[\\w]+)*(:[\\d]{2,5})?"); + private static final Pattern originPattern = Pattern.compile("(http://|https://)[\\w-]+(\\.[\\w-]+)*(:[\\d]{2,5})?"); public static String getOrigin(URI uri) { return getOrigin(uri.toString()); diff --git a/core/src/test/java/org/keycloak/util/UriUtilsTest.java b/core/src/test/java/org/keycloak/util/UriUtilsTest.java index 52d484ded8..af89777dfb 100644 --- a/core/src/test/java/org/keycloak/util/UriUtilsTest.java +++ b/core/src/test/java/org/keycloak/util/UriUtilsTest.java @@ -24,6 +24,8 @@ public class UriUtilsTest { assertValid("http://192.168.123.123"); assertValid("https://192.168.123.123"); assertValid("https://192.168.123.123:8080"); + assertValid("https://sub-sub.test.com"); + assertValid("https://sub.test-test.com"); assertInvalid("https://test/"); assertInvalid("{"); diff --git a/docbook/reference/en/en-US/modules/server-installation.xml b/docbook/reference/en/en-US/modules/server-installation.xml index 9e595a194d..5ca0cd8f50 100755 --- a/docbook/reference/en/en-US/modules/server-installation.xml +++ b/docbook/reference/en/en-US/modules/server-installation.xml @@ -625,29 +625,74 @@ keycloak-war-dist-all-&project.version;/ X-Forwarded-Proto headers on the requests made to Keycloak. Next you need to enable proxy-address-forwarding on the Keycloak http connector. Assuming that your reverse proxy doesn't use port 8443 for SSL you also need to configure what port http traffic is redirected to. - This is done by editing standalone/configuration/standalone.xml. - First add proxy-address-forwarding and redirect-socket to the http-listener - element: - + +
+ WildFly + + + Open standalone/configuration/standalone.xml in your favorite editor. + + + + First add proxy-address-forwarding and redirect-socket to + the http-listener element: ... - + ... ]]> - Then add a new socket-binding element to the socket-binding-group element: + + + Then add a new socket-binding element to the socket-binding-group element: + ... ... ]]> - - - Check the WildFly documentation for more information. - + + + Check the WildFly documentation for more information. + +
+ +
+ AS7/EAP + + + Open standalone/configuration/standalone.xml in your favorite editor. + + + + You need to add redirect-port to http connector element and + add the RemoteIpValve valve: + + + + + + + + + + +]]> + + + + +
+
diff --git a/events/api/src/main/java/org/keycloak/events/EventType.java b/events/api/src/main/java/org/keycloak/events/EventType.java index bdfdb0ee3f..d41fb8125c 100755 --- a/events/api/src/main/java/org/keycloak/events/EventType.java +++ b/events/api/src/main/java/org/keycloak/events/EventType.java @@ -40,9 +40,9 @@ public enum EventType { SEND_VERIFY_EMAIL_ERROR, SEND_RESET_PASSWORD, SEND_RESET_PASSWORD_ERROR, - SOCIAL_LOGIN, - SOCIAL_LOGIN_ERROR, + INVALID_SIGNATURE_ERROR, REGISTER_NODE, UNREGISTER_NODE + } diff --git a/forms/common-themes/src/main/resources/theme/account/base/messages/messages.properties b/forms/common-themes/src/main/resources/theme/account/base/messages/messages.properties index 9dfa90a834..6feedf537d 100755 --- a/forms/common-themes/src/main/resources/theme/account/base/messages/messages.properties +++ b/forms/common-themes/src/main/resources/theme/account/base/messages/messages.properties @@ -1,4 +1,4 @@ -authenticatorCode=One-time-password +authenticatorCode=One-time code email=Email errorHeader=Error! firstName=First name @@ -23,8 +23,8 @@ invalidTotp=Invalid authenticator code readOnlyUser=You can't update your account as it is read only readOnlyPassword=You can't update your password as your account is read only -successTotp=Google authenticator configured. -successTotpRemoved=Google authenticator removed. +successTotp=Mobile authenticator configured. +successTotpRemoved=Mobile authenticator removed. accountUpdated=Your account has been updated accountPasswordUpdated=Your password has been updated diff --git a/forms/common-themes/src/main/resources/theme/account/base/totp.ftl b/forms/common-themes/src/main/resources/theme/account/base/totp.ftl index d05dd8b616..d48033734b 100755 --- a/forms/common-themes/src/main/resources/theme/account/base/totp.ftl +++ b/forms/common-themes/src/main/resources/theme/account/base/totp.ftl @@ -12,25 +12,32 @@ - + Mobile - + <#else> -

Google Authenticator Setup

+

Authenticator

    -
  1. Download the FreeOTP app in your device.
    2. -
  2. Create an account in FreeOTP and scan the barcode or type in the provided key below.
    +
  3. + Install FreeOTP or + Google Authenticator + on your mobile +
    4. +
  4. + Open the application and scan the barcode or enter the key
    Figure: Barcode
    ${totp.totpSecretEncoded}
    5. -
  5. Enter the one-time-password provided by FreeOTP below and click Submit to finish the setup.
    6. +
  6. + Enter the one-time code provided by the application and click Submit to finish the setup. +
diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/oauth-clients.js b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/oauth-clients.js index 87dece9066..5fe70a76eb 100755 --- a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/oauth-clients.js +++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/oauth-clients.js @@ -282,7 +282,7 @@ module.controller('OAuthClientInstallationCtrl', function($scope, realm, install $scope.installation = installation; $scope.download = function() { - saveAs(new Blob([$scope.installation], { type: $scope.type }), 'keycloak.json'); + saveAs(new Blob([angular.toJson($scope.installation, true)], { type: 'application/json' }), 'keycloak.json'); } }); diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-list.html b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-list.html index 364b4c7c53..27a7d92bde 100755 --- a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-list.html +++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-list.html @@ -1,8 +1,5 @@
-

{{realm.realm}} Applications

diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-list.html b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-list.html index f5638b47a4..69e687e3b7 100755 --- a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-list.html +++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-list.html @@ -1,8 +1,5 @@
-

{{realm.realm}} OAuth Clients

diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/templates/kc-navigation-application.html b/forms/common-themes/src/main/resources/theme/admin/base/resources/templates/kc-navigation-application.html index 02343270d4..cb4d44a8b3 100755 --- a/forms/common-themes/src/main/resources/theme/admin/base/resources/templates/kc-navigation-application.html +++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/templates/kc-navigation-application.html @@ -1,4 +1,4 @@ -
    +
    • Settings
    • Credentials
    • SAML Keys
      • diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl b/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl index 48482553a9..d71536c965 100755 --- a/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl +++ b/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl @@ -30,13 +30,16 @@ <#elseif section = "info" >
      1. -

        ${rb.loginTotpStep1_1} ${rb.loginTotpStep1_2} ${rb.loginTotpStep1_3}

        +

        ${rb.loginTotpStep1}

      2. ${rb.loginTotpStep2}

        Figure: Barcode
        ${totp.totpSecretEncoded}
        3. +
      3. +

        ${rb.loginTotpStep3}

        +
      diff --git a/forms/common-themes/src/main/resources/theme/login/base/messages/messages.properties b/forms/common-themes/src/main/resources/theme/login/base/messages/messages.properties index ff0e6ad660..6b12161085 100755 --- a/forms/common-themes/src/main/resources/theme/login/base/messages/messages.properties +++ b/forms/common-themes/src/main/resources/theme/login/base/messages/messages.properties @@ -26,7 +26,7 @@ submit=Submit yes=Yes no=No -authenticatorCode=One-time-password +authenticatorCode=One-time code clientCertificate=Client Certificate invalidUser=Invalid username or password. @@ -47,8 +47,8 @@ invalidPasswordExisting=Invalid existing password invalidPasswordConfirm=Password confirmation doesn't match invalidTotp=Invalid authenticator code -successTotp=FreeOTP authenticator configured. -successTotpRemoved=FreeOTP authenticator removed. +successTotp=Mobile authenticator configured. +successTotpRemoved=Mobile authenticator removed. usernameExists=Username already exists emailExists=Email already exists @@ -60,13 +60,11 @@ loginOauthTitle=Temporary access. loginOauthTitleHtml=Temporary access requested. Login to grant access. loginForgot=Forgot -loginTotpTitle=FreeOTP Authenticator Setup -loginTotpStep1_1=Download the -loginTotpStep1_2=FreeOTP Authenticator app -loginTotpStep1_3=in your device. -loginTotpStep2=Create an account in FreeOTP and scan the barcode or type in the provided key below. -loginTotpStep3=Enter the one-time-password provided by FreeOTP below and click Submit to finish the setup. -loginTotpOneTime=One-time-password +loginTotpTitle=Mobile Authenticator Setup +loginTotpStep1=Install FreeOTP or Google Authenticator on your mobile +loginTotpStep2=Open the application and scan the barcode or enter the key +loginTotpStep3=Enter the one-time code provided by the application and click Submit to finish the setup +loginTotpOneTime=One-time code loginProfileTitle=Update Account Information loginProfileWarning=Your account is not enabled because you need to update your account information. @@ -91,7 +89,7 @@ errorTitle=We're sorry... errorTitleHtml=We're sorry ... errorGenericMsg=Something happened and we could not process your request. actionWarningHeader=Your account is not enabled. -actionTotpWarning=You need to set up the FreeOTP Authenticator to activate your account. +actionTotpWarning=You need to set up Mobile Authenticator to activate your account. actionProfileWarning=You need to update your user profile to activate your account. actionPasswordWarning=You need to change your password to activate your account. actionEmailWarning=You need to verify your email address to activate your account. diff --git a/integration/adapter-core/pom.xml b/integration/adapter-core/pom.xml index 9d1e964e57..07a4cccfc8 100755 --- a/integration/adapter-core/pom.xml +++ b/integration/adapter-core/pom.xml @@ -10,7 +10,7 @@ 4.0.0 keycloak-adapter-core - Keycloak AS7 Integration + Keycloak Adapter Core diff --git a/model/api/src/main/java/org/keycloak/models/utils/RepresentationToModel.java b/model/api/src/main/java/org/keycloak/models/utils/RepresentationToModel.java index 31e26c3609..961039505d 100755 --- a/model/api/src/main/java/org/keycloak/models/utils/RepresentationToModel.java +++ b/model/api/src/main/java/org/keycloak/models/utils/RepresentationToModel.java @@ -52,6 +52,9 @@ public class RepresentationToModel { if (rep.getQuickLoginCheckMilliSeconds() != null) newRealm.setQuickLoginCheckMilliSeconds(rep.getQuickLoginCheckMilliSeconds()); if (rep.getMaxDeltaTimeSeconds() != null) newRealm.setMaxDeltaTimeSeconds(rep.getMaxDeltaTimeSeconds()); if (rep.getFailureFactor() != null) newRealm.setFailureFactor(rep.getFailureFactor()); + if (rep.isEventsEnabled() != null) newRealm.setEventsEnabled(rep.isEventsEnabled()); + if (rep.getEventsExpiration() != null) newRealm.setEventsExpiration(rep.getEventsExpiration()); + if (rep.getEventsListeners() != null) newRealm.setEventsListeners(new HashSet(rep.getEventsListeners())); if (rep.getNotBefore() != null) newRealm.setNotBefore(rep.getNotBefore()); @@ -263,6 +266,9 @@ public class RepresentationToModel { if (rep.getAccountTheme() != null) realm.setAccountTheme(rep.getAccountTheme()); if (rep.getAdminTheme() != null) realm.setAdminTheme(rep.getAdminTheme()); if (rep.getEmailTheme() != null) realm.setEmailTheme(rep.getEmailTheme()); + if (rep.isEventsEnabled() != null) realm.setEventsEnabled(rep.isEventsEnabled()); + if (rep.getEventsExpiration() != null) realm.setEventsExpiration(rep.getEventsExpiration()); + if (rep.getEventsListeners() != null) realm.setEventsListeners(new HashSet(rep.getEventsListeners())); if (rep.getPasswordPolicy() != null) realm.setPasswordPolicy(new PasswordPolicy(rep.getPasswordPolicy())); diff --git a/pom.xml b/pom.xml index 5b3f1547ca..430aea1b95 100755 --- a/pom.xml +++ b/pom.xml @@ -516,6 +516,29 @@ com.restfully.*:org.jboss.resteasy.examples.*:se.unlogic.*:org.jboss.resteasy.tests.* + + true + + true + true + + + ${project.url} + ${java.version} + ${java.vendor} + ${os.name} + ${os.arch} + ${os.version} + ${project.scm.url} + ${project.scm.connection} + ${buildNumber} + ${build.datetime} + JBoss (http://www.jboss.org/) + http://www.jboss.org/ + JBoss by Red Hat, Inc + http://www.jboss.org/ + + @@ -530,6 +553,31 @@ org.apache.maven.plugins maven-source-plugin 2.1.2 + + + true + + true + true + + + ${project.url} + ${java.version} + ${java.vendor} + ${os.name} + ${os.arch} + ${os.version} + ${project.scm.url} + ${project.scm.connection} + ${buildNumber} + ${build.datetime} + JBoss (http://www.jboss.org/) + http://www.jboss.org/ + JBoss by Red Hat, Inc + http://www.jboss.org/ + + + verify @@ -566,6 +614,31 @@ org.apache.maven.plugins maven-jar-plugin 2.2 + + + true + + true + true + + + ${project.url} + ${java.version} + ${java.vendor} + ${os.name} + ${os.arch} + ${os.version} + ${project.scm.url} + ${project.scm.connection} + ${buildNumber} + ${build.datetime} + JBoss (http://www.jboss.org/) + http://www.jboss.org/ + JBoss by Red Hat, Inc + http://www.jboss.org/ + + + org.codehaus.mojo @@ -604,6 +677,11 @@ 3.1.1 + + org.codehaus.mojo + buildnumber-maven-plugin + 1.3 + @@ -658,6 +736,37 @@ maven-clover2-plugin 3.1.6 + + org.codehaus.mojo + buildnumber-maven-plugin + + + get-build-timestamp + initialize + + create-timestamp + + + + EEE, d MMM yyyy HH:mm:ss Z + build.datetime + + + + get-scm-revision + initialize + + create + + + false + false + UNKNOWN + true + + + + diff --git a/services/src/main/java/org/keycloak/services/resources/SocialResource.java b/services/src/main/java/org/keycloak/services/resources/SocialResource.java index ce40497b37..195a9bfdf7 100755 --- a/services/src/main/java/org/keycloak/services/resources/SocialResource.java +++ b/services/src/main/java/org/keycloak/services/resources/SocialResource.java @@ -121,7 +121,7 @@ public class SocialResource { RealmModel realm = clientSession.getRealm(); EventBuilder event = new EventsManager(realm, session, clientConnection).createEventBuilder() - .event(EventType.SOCIAL_LOGIN) + .event(EventType.LOGIN) .client(clientSession.getClient()) .detail(Details.REDIRECT_URI, clientSession.getRedirectUri()) .detail(Details.AUTH_METHOD, authMethod); diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java index 0a3f6c36f8..c8b41c2b14 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java @@ -125,7 +125,7 @@ public class AssertEvents implements TestRule, EventListenerProviderFactory { } public ExpectedEvent expectSocialLogin() { - return expect(EventType.SOCIAL_LOGIN) + return expect(EventType.LOGIN) .detail(Details.CODE_ID, isCodeId()) .detail(Details.USERNAME, DEFAULT_USERNAME) .detail(Details.AUTH_METHOD, "form") diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java index cffdda8386..a3329d8beb 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java @@ -348,7 +348,7 @@ public class AccountTest { totpPage.configure(totp.generate(totpPage.getTotpSecret())); - Assert.assertEquals("Google authenticator configured.", profilePage.getSuccess()); + Assert.assertEquals("Mobile authenticator configured.", profilePage.getSuccess()); events.expectAccount(EventType.UPDATE_TOTP).assertEvent(); diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountTotpPage.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountTotpPage.java index 99716a2e47..da59926cf8 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountTotpPage.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/AccountTotpPage.java @@ -44,7 +44,7 @@ public class AccountTotpPage extends AbstractAccountPage { @FindBy(css = "button[type=\"submit\"]") private WebElement submitButton; - @FindBy(id = "remove-google") + @FindBy(id = "remove-mobile") private WebElement removeLink; public void configure(String totp) { diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java index edb8cc5a36..4f6a5ab699 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java @@ -48,7 +48,7 @@ public class LoginConfigTotpPage extends AbstractPage { } public boolean isCurrent() { - return driver.getTitle().equals("FreeOTP Authenticator Setup"); + return driver.getTitle().equals("Mobile Authenticator Setup"); } public void open() {