[JENKINS-36483] Removes spaces from the Domain

jenkinsci · Feb 4, 2017 · bd9d822 · bd9d822
1 parent 2f95fae
commit bd9d822
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/googlelogin/GoogleOAuth2SecurityRealm.java b/src/main/java/org/jenkinsci/plugins/googlelogin/GoogleOAuth2SecurityRealm.java
@@ -105,7 +105,7 @@ public class GoogleOAuth2SecurityRealm extends SecurityRealm {
     public GoogleOAuth2SecurityRealm(String clientId, String clientSecret, String domain) throws IOException {
         this.clientId = clientId;
         this.clientSecret = Secret.fromString(clientSecret);
-        this.domain = Util.fixEmpty(domain);
+        this.domain = Util.fixEmptyAndTrim(domain);
     }
 
     public String getClientId() {

diff --git a/src/test/java/org/jenkinsci/plugins/googlelogin/GoogleOAuth2SecurityRealmTest.java b/src/test/java/org/jenkinsci/plugins/googlelogin/GoogleOAuth2SecurityRealmTest.java
@@ -15,6 +15,20 @@ public class GoogleOAuth2SecurityRealmTest {
     @Rule
     public JenkinsRule jenkins = new JenkinsRule();
 
+    @Test
+    public void accidentallyBlank() throws IOException {
+        GoogleOAuth2SecurityRealm instance = setupInstanceWithDomains(" ");
+        assertTrue(instance.isDomainValid("acme.com"));
+        assertTrue(instance.isDomainValid("mycompany.com"));
+    }
+
+    @Test
+    public void trailingSpace() throws IOException {
+        GoogleOAuth2SecurityRealm instance = setupInstanceWithDomains("acme.com ");
+        assertTrue(instance.isDomainValid("acme.com"));
+        assertFalse(instance.isDomainValid("mycompany.com"));
+    }
+
     @Test
     public void validSingleDomain() throws IOException {
         GoogleOAuth2SecurityRealm instance = setupInstanceWithDomains("acme.com");