Open Build Service

rubygem-bender-vhng.changes Changed

rubygem-bender-vhng.spec Changed

bender-vhng-2.1.10.gem/checksums.yaml.gz -> bender-vhng-2.1.11.gem/checksums.yaml.gz Changed

bender-vhng-2.1.10.gem/data/lib/bender/classes/Models/Webserver/WebHosts.rb -> bender-vhng-2.1.11.gem/data/lib/bender/classes/Models/Webserver/WebHosts.rb Changed

bender-vhng-2.1.10.gem/data/lib/bender/classes/Plugins/Webserver/95-Docker.rb -> bender-vhng-2.1.11.gem/data/lib/bender/classes/Plugins/Webserver/95-Docker.rb Changed

@@ -1,5 +1,6 @@
 require 'bender/classes/Plugin'
 require 'securerandom'
+require 'bcrypt'
 
 $pluginClass = :Docker
 
@@ -125,6 +126,25 @@
       configfiles << { 'source' => k.to_s, 'target' => v:container }
     end
 
+    access = if host.http.access_rules
+      host.http.access_rules.map do | rule |
+        r = {location: rule.location}
+        if rule.allow_from_all
+          deny = rule.deny_from.presence
+          r:deny = deny if deny
+        else
+          allow = rule.allow_from.presence || 
+          r:allow = allow
+        end
+        if rule.auth.try(:any?)
+          r:auth = rule.auth.map do | x |
+            "#{x.username}:#{BCrypt::Password.create(x.password.presence || SecureRandom.alphanumeric(8))}"
+          end
+        end
+        r
+      end
+    end
+
     labels = {
       'vhosts-ng/service/name' => host.service.name,
       'vhosts-ng/service/auto-route' => env:settings:proxy:auto_route,
@@ -143,8 +163,8 @@
     if env:settings:proxy:aliases.try(&:any?)
       labels'vhosts-ng/service/aliases' = env:settings:proxy:aliases.join(',')
     end
-    if host.ssl.enabled
 
+    if host.ssl.enabled
       if host.ssl.letsencrypt
         labels'vhosts-ng/ssl/letsencrypt_name' = 'letsencrypt'
       end
@@ -155,10 +175,15 @@
         end
       end
     end
+
     if env:settings:max_body_size
       labels'vhosts-ng/max_body_size' = "%dm" % env:settings:max_body_size
     end
 
+    if access.present?
+      labels'vhosts-ng/http/access-rules' = Base64.strict_encode64(JSON.dump(access))
+    end
+
     config = {
       'version' => "3.7",
       'services' => {

bender-vhng-2.1.10.gem/metadata.gz -> bender-vhng-2.1.11.gem/metadata.gz Changed

Changes of Revision 22