update expected output of blobstore conf templating in unit tests

cloudfoundry · Sep 4, 2019 · 069e135 · 069e135
1 parent db707c2
commit 069e135
Showing 1 changed file with 65 additions and 25 deletions.
diff --git a/spec/blobstore.conf.erb_spec.rb b/spec/blobstore.conf.erb_spec.rb
@@ -27,7 +27,7 @@
               'nginx' => {
                 'enable_metrics_endpoint' => true
               },
-              'secret' => 'mysecret',
+              'secret' => 'hmac_secret',
             }
           }
         }
@@ -54,7 +54,7 @@
   ssl_certificate /var/vcap/jobs/blobstore/config/server_tls_cert.pem;
   ssl_certificate_key /var/vcap/jobs/blobstore/config/server_tls_private_key.pem;
 
-  location / {
+  location ~* ^/(?<object_id>[a-fA-F0-9][a-fA-F0-9]\\/.+) {
     root /var/vcap/store/blobstore/store/;
 
     dav_methods DELETE PUT;
@@ -69,8 +69,16 @@
     }
   }
 
+  location /internal {
+    internal;
+    alias /var/vcap/store/blobstore/store/;
+
+    dav_methods DELETE PUT;
+    create_full_put_path on;
+  }
+
   location ~* ^/signed/(?<object_id>.+)$ {
-    if ( $request_method !~ ^(GET|PUT)$ ) {
+    if ( $request_method !~ ^(GET|PUT|HEAD)$ ) {
       return 405;
     }
 
@@ -87,10 +95,10 @@
     secure_link_hmac_algorithm sha256;
 
     if ($secure_link_hmac != "1") {
-      return 404;
+      return 403;
     }
 
-    rewrite ^/signed/(.*)$ /$object_id;
+    rewrite ^/signed/(.*)$ /internal/$object_id;
   }
 
   
@@ -127,7 +135,7 @@
               'nginx' => {
                 'enable_metrics_endpoint' => false
               },
-              'secret' => 'mysecret',
+              'secret' => 'hmac_secret',
             }
           }
         }
@@ -154,7 +162,7 @@
   ssl_certificate /var/vcap/jobs/blobstore/config/server_tls_cert.pem;
   ssl_certificate_key /var/vcap/jobs/blobstore/config/server_tls_private_key.pem;
 
-  location / {
+  location ~* ^/(?<object_id>[a-fA-F0-9][a-fA-F0-9]\\/.+) {
     root /var/vcap/store/blobstore/store/;
 
     dav_methods DELETE PUT;
@@ -169,8 +177,16 @@
     }
   }
 
+  location /internal {
+    internal;
+    alias /var/vcap/store/blobstore/store/;
+
+    dav_methods DELETE PUT;
+    create_full_put_path on;
+  }
+
   location ~* ^/signed/(?<object_id>.+)$ {
-    if ( $request_method !~ ^(GET|PUT)$ ) {
+    if ( $request_method !~ ^(GET|PUT|HEAD)$ ) {
       return 405;
     }
 
@@ -187,10 +203,10 @@
     secure_link_hmac_algorithm sha256;
 
     if ($secure_link_hmac != "1") {
-      return 404;
+      return 403;
     }
 
-    rewrite ^/signed/(.*)$ /$object_id;
+    rewrite ^/signed/(.*)$ /internal/$object_id;
   }
 
   
@@ -218,7 +234,7 @@
               'nginx' => {
                 'enable_metrics_endpoint' => false
               },
-              'secret' => 'mysecret',
+              'secret' => 'hmac_secret',
             }
           }
         }
@@ -243,7 +259,7 @@
   ssl_certificate /var/vcap/jobs/blobstore/config/server_tls_cert.pem;
   ssl_certificate_key /var/vcap/jobs/blobstore/config/server_tls_private_key.pem;
 
-  location / {
+  location ~* ^/(?<object_id>[a-fA-F0-9][a-fA-F0-9]\\/.+) {
     root /var/vcap/store/blobstore/store/;
 
     dav_methods DELETE PUT;
@@ -258,8 +274,16 @@
     }
   }
 
+  location /internal {
+    internal;
+    alias /var/vcap/store/blobstore/store/;
+
+    dav_methods DELETE PUT;
+    create_full_put_path on;
+  }
+
   location ~* ^/signed/(?<object_id>.+)$ {
-    if ( $request_method !~ ^(GET|PUT)$ ) {
+    if ( $request_method !~ ^(GET|PUT|HEAD)$ ) {
       return 405;
     }
 
@@ -276,10 +300,10 @@
     secure_link_hmac_algorithm sha256;
 
     if ($secure_link_hmac != "1") {
-      return 404;
+      return 403;
     }
 
-    rewrite ^/signed/(.*)$ /$object_id;
+    rewrite ^/signed/(.*)$ /internal/$object_id;
   }
 
   
@@ -307,7 +331,7 @@
               'nginx' => {
                 'enable_metrics_endpoint' => false
               },
-              'secret' => 'mysecret',
+              'secret' => 'hmac_secret',
             }
           }
         }
@@ -334,7 +358,7 @@
   ssl_certificate /var/vcap/jobs/blobstore/config/server_tls_cert.pem;
   ssl_certificate_key /var/vcap/jobs/blobstore/config/server_tls_private_key.pem;
 
-  location / {
+  location ~* ^/(?<object_id>[a-fA-F0-9][a-fA-F0-9]\\/.+) {
     root /var/vcap/store/blobstore/store/;
 
     dav_methods DELETE PUT;
@@ -349,8 +373,16 @@
     }
   }
 
+  location /internal {
+    internal;
+    alias /var/vcap/store/blobstore/store/;
+
+    dav_methods DELETE PUT;
+    create_full_put_path on;
+  }
+
   location ~* ^/signed/(?<object_id>.+)$ {
-    if ( $request_method !~ ^(GET|PUT)$ ) {
+    if ( $request_method !~ ^(GET|PUT|HEAD)$ ) {
       return 405;
     }
 
@@ -367,10 +399,10 @@
     secure_link_hmac_algorithm sha256;
 
     if ($secure_link_hmac != "1") {
-      return 404;
+      return 403;
     }
 
-    rewrite ^/signed/(.*)$ /$object_id;
+    rewrite ^/signed/(.*)$ /internal/$object_id;
   }
 
   
@@ -398,7 +430,7 @@
               'nginx' => {
                 'enable_metrics_endpoint' => false
               },
-              'secret' => 'mysecret',
+              'secret' => 'hmac_secret',
             }
           }
         }
@@ -425,7 +457,7 @@
   ssl_certificate /var/vcap/jobs/blobstore/config/server_tls_cert.pem;
   ssl_certificate_key /var/vcap/jobs/blobstore/config/server_tls_private_key.pem;
 
-  location / {
+  location ~* ^/(?<object_id>[a-fA-F0-9][a-fA-F0-9]\\/.+) {
     root /var/vcap/store/blobstore/store/;
 
     dav_methods DELETE PUT;
@@ -440,8 +472,16 @@
     }
   }
 
+  location /internal {
+    internal;
+    alias /var/vcap/store/blobstore/store/;
+
+    dav_methods DELETE PUT;
+    create_full_put_path on;
+  }
+
   location ~* ^/signed/(?<object_id>.+)$ {
-    if ( $request_method !~ ^(GET|PUT)$ ) {
+    if ( $request_method !~ ^(GET|PUT|HEAD)$ ) {
       return 405;
     }
 
@@ -458,10 +498,10 @@
     secure_link_hmac_algorithm sha256;
 
     if ($secure_link_hmac != "1") {
-      return 404;
+      return 403;
     }
 
-    rewrite ^/signed/(.*)$ /$object_id;
+    rewrite ^/signed/(.*)$ /internal/$object_id;
   }