Remove IP check for SAS

Josh Friedman · Josh Friedman · commit 0541354ec5f4 · 2017-10-31T14:03:22.000-07:00
diff --git a/microsoft-azure-storage-test/src/com/microsoft/azure/storage/AccountSasTests.java b/microsoft-azure-storage-test/src/com/microsoft/azure/storage/AccountSasTests.java
@@ -208,14 +208,6 @@ public void testBlobIPAccountSas() throws InvalidKeyException, StorageException,
         }
         catch (StorageException ex) {
             assertEquals(HttpURLConnection.HTTP_FORBIDDEN, ex.getHttpStatusCode());
-
-            final String[] words = ex.getMessage().split(" ");
-            // final word
-            String lastWord = words[words.length - 1];
-            // strip trailing period
-            lastWord = lastWord.substring(0, lastWord.length() - 1);
-
-            sourceIP = new IPRange(lastWord);
         }
         finally {
             this.blobContainer.deleteIfExists();
@@ -340,14 +332,6 @@ public void testFileIPAccountSas() throws InvalidKeyException, StorageException,
         }
         catch (StorageException ex) {
             assertEquals(HttpURLConnection.HTTP_FORBIDDEN, ex.getHttpStatusCode());
-
-            final String[] words = ex.getMessage().split(" ");
-            // final word
-            String lastWord = words[words.length - 1];
-            // strip trailing period
-            lastWord = lastWord.substring(0, lastWord.length() - 1);
-
-            sourceIP = new IPRange(lastWord);
         }
         finally {
             this.fileShare.deleteIfExists();
@@ -474,14 +458,6 @@ public void testQueueIPAccountSas()
         }
         catch (StorageException ex) {
             assertEquals(HttpURLConnection.HTTP_FORBIDDEN, ex.getHttpStatusCode());
-
-            final String[] words = ex.getMessage().split(" ");
-            // final word
-            String lastWord = words[words.length - 1];
-            // strip trailing period
-            lastWord = lastWord.substring(0, lastWord.length() - 1);
-
-            sourceIP = new IPRange(lastWord);
         }
         finally {
             this.queueQueue.deleteIfExists();
@@ -608,14 +584,6 @@ public void testTableIPAccountSas() throws InvalidKeyException, StorageException
         }
         catch (StorageException ex) {
             assertEquals(HttpURLConnection.HTTP_FORBIDDEN, ex.getHttpStatusCode());
-
-            final String[] words = ex.getMessage().split(" ");
-            // final word
-            String lastWord = words[words.length - 1];
-            // strip trailing period
-            lastWord = lastWord.substring(0, lastWord.length() - 1);
-
-            sourceIP = new IPRange(lastWord);
         }
         finally {
             this.tableTable.deleteIfExists();
diff --git a/microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/SasTests.java b/microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/SasTests.java
@@ -137,14 +137,6 @@ public void testIpAcl()
         }
         catch (StorageException ex) {
             assertEquals(HttpURLConnection.HTTP_FORBIDDEN, ex.getHttpStatusCode());
-            
-            final String[] words = ex.getMessage().split(" ");
-            // final word
-            String lastWord = words[words.length - 1];
-            // strip trailing period
-            lastWord = lastWord.substring(0, lastWord.length() - 1);
-            
-            sourceIP = new IPRange(lastWord);
         }
         
         // Ensure access attempt from the single allowed IP succeeds
diff --git a/microsoft-azure-storage-test/src/com/microsoft/azure/storage/file/FileSasTests.java b/microsoft-azure-storage-test/src/com/microsoft/azure/storage/file/FileSasTests.java
@@ -181,14 +181,6 @@ public void testIpAcl()
         }
         catch (StorageException ex) {
             assertEquals(HttpURLConnection.HTTP_FORBIDDEN, ex.getHttpStatusCode());
-            
-            final String[] words = ex.getMessage().split(" ");
-            // final word
-            String lastWord = words[words.length - 1];
-            // strip trailing period
-            lastWord = lastWord.substring(0, lastWord.length() - 1);
-            
-            sourceIP = new IPRange(lastWord);
         }
         
         // Ensure access attempt from the single allowed IP succeeds

Original file line number	Diff line number	Diff line change
`@@ -137,14 +137,6 @@ public void testIpAcl()`
`137`	`137`	`}`
`138`	`138`	`catch (StorageException ex) {`
`139`	`139`	`assertEquals(HttpURLConnection.HTTP_FORBIDDEN, ex.getHttpStatusCode());`
`140`		`-`
`141`		`- final String[] words = ex.getMessage().split(" ");`
`142`		`- // final word`
`143`		`- String lastWord = words[words.length - 1];`
`144`		`- // strip trailing period`
`145`		`- lastWord = lastWord.substring(0, lastWord.length() - 1);`
`146`		`-`
`147`		`- sourceIP = new IPRange(lastWord);`
`148`	`140`	`}`
`149`	`141`
`150`	`142`	`// Ensure access attempt from the single allowed IP succeeds`
Original file line number	Diff line number	Diff line change
`@@ -181,14 +181,6 @@ public void testIpAcl()`
`181`	`181`	`}`
`182`	`182`	`catch (StorageException ex) {`
`183`	`183`	`assertEquals(HttpURLConnection.HTTP_FORBIDDEN, ex.getHttpStatusCode());`
`184`		`-`
`185`		`- final String[] words = ex.getMessage().split(" ");`
`186`		`- // final word`
`187`		`- String lastWord = words[words.length - 1];`
`188`		`- // strip trailing period`
`189`		`- lastWord = lastWord.substring(0, lastWord.length() - 1);`
`190`		`-`
`191`		`- sourceIP = new IPRange(lastWord);`
`192`	`184`	`}`
`193`	`185`
`194`	`186`	`// Ensure access attempt from the single allowed IP succeeds`