haproxy-api 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c50776286df12d8f2a7a7418c4a86c08863fdcdb
-  data.tar.gz: 4cb2f9c9e305b53ac0d5fd90a0dbbaae1279a810
+  metadata.gz: 8ec0d41213ad50b219654bd950588472b9431257
+  data.tar.gz: da194c115f417fe807cffcd80269927bcf4b9647
 SHA512:
-  metadata.gz: e11c41eaeacad31d91ee1b5b648e65b49edd9ba656dbbfd0a73c7f6930cc345c56bd47f4c6bf97528b778f1048383cb2061519233bc73cc02334eb3319371068
-  data.tar.gz: 09674ffad2bae4a48799694576d1e9bfe8cf8d9d47c79696044c73f9cc79e9c8fef8b94d44cdbafac859a0f6ff69255942b02a1dd1a3df5965c46e8e8bdb2cc3
+  metadata.gz: 284ca7c41cdcd1a0aa116637abe630a89b8d042829eb896b467deb8474f3f8c32d5e8f3c2fc654edf6937c3c593c0e3327a1221653beb73aca39dc4d371b2544
+  data.tar.gz: 8155a14a98fafbeb65c56d035115f15540f028f334a684fcc772e1af0a38525df4fa46028ec076d746f511325ce4855ab7b54d89f6c7488c8e4721ea0b6ae5cf

data/bin/install_haproxy-api_initd

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-if !File.exists('/etc/haproxy/hapi.crt')
+if !File.exists?('/etc/haproxy/hapi.crt')
   puts "generating hapi.crt and hapi.key in /etc/haproxy"
   Dir.chdir '/etc/haproxy'
   system("openssl req -x509 -newkey rsa:4096 -keyout hapi.key -out hapi.crt -days 365 -nodes -subj \"/C=UT/ST=Sandy /L=Sandy/O=Global Security/OU=IT Department/CN=tooese.com\"")

data/haproxy-api.gemspec

@@ -2,7 +2,7 @@ $:.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'haproxy-api'
-  s.version     = '0.1.2'
+  s.version     = '0.1.3'
   s.license     = 'Apache-2.0'
   s.author      = 'Mike Schwankl'
   s.email       = 'schwankl@gmail.com'

data/lib/hapi/application/app.rb

@@ -31,13 +31,6 @@ class HaproxyApi < Sinatra::Base
     $haproxy_config = ENV['HAPROXY_CONFIG']
   end
   $mutable_haproxy_config = $haproxy_config + '.haproxy-api.json'
-  
-  #before do
-  #  request.body.rewind
-  #  if request.body.size > 0
-  #    @request_payload = JSON.parse request.body.read
-  #  end
-  #end  
 
 
   def get_config
@@ -70,7 +63,18 @@ class HaproxyApi < Sinatra::Base
     config['frontend'].each_pair do |name, frontend|
       content += "frontend #{name}\n"
       content += "  bind 0.0.0.0:#{frontend['port']}\n"
-      content += "  default_backend #{name}-backend\n"
+      if frontend.has_key? 'acls'
+        port = ''
+        frontend['acls'].each_pair do |acl,backend_port|        
+          clean_name = acl.gsub('/','_')
+          content += "  acl url_#{clean_name} path_beg #{acl}\n"
+          content += "  use_backend #{name}-#{backend_port}-backend if url_#{clean_name}\n"
+          port = backend_port
+        end
+        content += "  default_backend #{name}-#{port}-backend\n"
+      else
+        content += "  default_backend #{name}-backend\n"
+      end            
       content += "\n"
     end
 
@@ -93,7 +97,7 @@ class HaproxyApi < Sinatra::Base
       end
 
       backend['servers'].each do |server|
-        content += "  server #{server}:#{port} #{server}:#{port} #{server_options} \n"      
+        content += "  server #{server}:#{port} #{server}:#{port} #{server_options} \n"
       end
       content += "\n"        
     end
@@ -121,17 +125,33 @@ class HaproxyApi < Sinatra::Base
       return status(500)
     end
   end
+  
+  
+  def add_acl ( frontend, id, config )
+    acl = frontend['acl']        
+    backend_port = frontend['backend_port']
+    if config.has_key?('frontend') && config['frontend'].has_key?(id)
+      frontend = config['frontend'][id]
+    end
+    if !frontend.has_key?('acls')
+      frontend['acls'] = {}
+    end
+    frontend['acls'][acl] = backend_port
+  end
 
+  
   get '/render' do
     config = get_config
     render config
   end  
-      
+
+
   get '/frontends' do
     config = get_config
     JSON.dump(config['frontend'])
   end
-  
+
+
   get '/frontend/:id' do
     config = get_config
     id = params[:id]
@@ -139,6 +159,7 @@ class HaproxyApi < Sinatra::Base
     JSON.dump(config['frontend'][id])
   end
 
+
   post '/frontend/:id' do
     config = get_config
     
@@ -149,11 +170,30 @@ class HaproxyApi < Sinatra::Base
     end
 
     frontend = JSON.parse request.body.read
+    if frontend.has_key? 'acl'
+      add_acl frontend, id, config
+    end
+    
     config['frontend'][id] = frontend
     set_config config
     JSON.dump(frontend)
   end 
 
+
+  put '/frontend/:id' do
+    config = get_config    
+    id = params[:id]
+    frontend = JSON.parse request.body.read
+    if frontend.has_key? 'acl'
+      add_acl frontend, id, config
+    else
+     config['frontend'][id] = frontend                
+    end
+    set_config config
+    JSON.dump(frontend)
+  end
+
+  
   delete '/frontend/:id' do
     config = get_config
     config['frontend'].delete params[:id]
@@ -177,17 +217,31 @@ class HaproxyApi < Sinatra::Base
 
   post '/backend/:id' do
     config = get_config
-    id = params[:id] + "-backend"
+    backend = JSON.parse request.body.read        
+    if backend.has_key?('acl')
+      id = params[:id] + '-' + backend['port'] + "-backend"
+    else
+      id = params[:id] + "-backend"
+    end
     if config['backend'].has_key?(id)
       puts "#{id} already exists - use put"
       return status(500)
     end
-    backend = JSON.parse request.body.read
     config['backend'][id] = backend
     set_config config
     JSON.dump(backend)
   end
-   
+
+
+  put '/backend/:id' do
+    config = get_config
+    id = params[:id] + "-backend"
+    backend = JSON.parse request.body.read
+    config['backend'][id] = backend
+    set_config config
+    JSON.dump(backend)
+  end  
+     
   
   delete '/backend/:id' do
     config = get_config
@@ -198,4 +252,3 @@ class HaproxyApi < Sinatra::Base
 end
 
 Rack::Handler::WEBrick.run HaproxyApi, webrick_options
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haproxy-api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Mike Schwankl