Guard RedisURI creation against URI without scheme #694

redis · Feb 16, 2018 · 07ed1b8 · 07ed1b8
1 parent e77a26f
commit 07ed1b8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/main/java/com/lambdaworks/redis/RedisURI.java b/src/main/java/com/lambdaworks/redis/RedisURI.java
@@ -504,6 +504,10 @@ public URI toURI() {
     }
 
     private static RedisURI buildRedisUriFromUri(URI uri) {
+
+        LettuceAssert.notNull(uri, "URI must not be null");
+        LettuceAssert.notNull(uri.getScheme(), "URI scheme must not be null");
+
         Builder builder;
         if (uri.getScheme().equals(URI_SCHEME_REDIS_SENTINEL)) {
             builder = configureSentinel(uri);

diff --git a/src/test/java/com/lambdaworks/redis/RedisURITest.java b/src/test/java/com/lambdaworks/redis/RedisURITest.java
@@ -76,6 +76,11 @@ public void simpleUriTest() {
         assertThat(redisURI.toURI().toString()).isEqualTo("redis://localhost");
     }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowIllegalArgumentExceptionOnMalformedUri() {
+        RedisURI.create("localhost");
+    }
+
     @Test
     public void sslUriTest() {
         RedisURI redisURI = RedisURI.create("redis+ssl://localhost:6379");