Open Build Service

rubygem-nginx-controller.spec Changed

nginx-controller-2.0.0.gem/checksums.yaml.gz -> nginx-controller-2.0.1.gem/checksums.yaml.gz Changed

nginx-controller-2.0.0.gem/data/lib/nginx_controller.rb -> nginx-controller-2.0.1.gem/data/lib/nginx_controller.rb Changed

nginx-controller-2.0.0.gem/data/lib/nginx_controller/docker/service.rb -> nginx-controller-2.0.1.gem/data/lib/nginx_controller/docker/service.rb Changed

@@ -198,12 +198,28 @@
       end
 
       def auth_basic
-        locs = labels.select{|l| l =~ /vhosts-ng\/auth\/basic/}.map { | k, v |
-          loc = k.gsub(/vhosts-ng\/auth\/basic/, '')
-          secret, realm = v.split(',', 2)
-          loc, {location: loc, secret: secret, realm: realm || 'Pretected area'}
-        }
-        locs = Hashlocs
+        @auth_basic ||= begin
+          count = 1
+          auths = labels.select{|l| l =~ /vhosts-ng\/auth\/basic/}.map { | k, v |
+            loc = k.gsub(/vhosts-ng\/auth\/basic/, '')
+            secret, realm = v.split(',', 2)
+            secret = File::expand_path(secret, '/') # sanitize....
+            secret = File.join(NginxController.htpasswd_path, service_name, secret)
+            unless File.exists?(secret)
+              # generate a dummy htpasswd with a random username/password
+              secret = File.join(NginxController.htpasswd_path, "dummy", service_name, "htpasswd.#{count}")
+              FileUtils.mkdir_p(File.dirname(secret))
+              File.open(secret, 'wb+') do | f |
+                f.write "%s:%s" % 
+                  SecureRandom.alphanumeric(8),
+                  SecureRandom.alphanumeric(16).crypt("$5$#{SecureRandom.alphanumeric(8)}$"),
+                
+              end
+            end
+            loc, {location: loc, secret: secret, realm: realm || 'Pretected area'}
+          }
+          auths = Hashauths
+        end
       end
 
       def le_validation_host
@@ -305,7 +321,7 @@
               id = File::basename(id) # LAZY but works
               names = d.split(',').map(&:strip).compact
 
-              if matches.any? && File::exists?(File.join(NginxController.certs_path, service_name, "#{id}.pem"))
+              if names.any? && File::exists?(File.join(NginxController.certs_path, service_name, "#{id}.pem"))
                 list << OpenStruct.new({
                   names: names,
                   cert: File.join(NginxController.certs_path, service_name, "#{id}.pem"),

nginx-controller-2.0.0.gem/metadata.gz -> nginx-controller-2.0.1.gem/metadata.gz Changed

Changes of Revision 5