smart_proxy_salt 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7dc004f36b7961d8101ee986cfa040e698ea4d7
-  data.tar.gz: 1a72efead0f951b1bb8f15d496a4951a280ca093
+  metadata.gz: 6a479ace7ffeb895281d60a176b7f47c5ed96975
+  data.tar.gz: af15fc5c2a9072e3e7a70dc57b520895b2f94276
 SHA512:
-  metadata.gz: 51057ad26a27607f5cb9fd79f7b492d1583706e6a67f1210701e3775adecc6487728ae9cc6a579626ef16e2a626813a33a86930ff825893eea8bfae7f7e7e80f
-  data.tar.gz: 9a1468d8a95ea045cebeb772947e8e349fd8ae6772e08f3fd4acf3d495cdd5775c5f2756078d44694511c19c9a207d0d0efd5cae394409d3a76c3c99fe482fa2
+  metadata.gz: 5c84eaea9f1a759457655941dd8a5c053543968bea016fe5e8301629d852c947a69ede9b8f331c6f4871c7fcc7484317d2efe5613323b3cbe0ba22c4351038b7
+  data.tar.gz: 8a77baac462e5697879b14fbcec1a96d9b93a7cdca86f527aafb84edf47519bdf2b7b5c72a60322538d7b32c3e638e0af19d66b071885c491d3778c7ea98b113

data/bin/foreman-node

@@ -33,7 +33,7 @@ def foreman_url
 end
 
 def valid_hostname?(hostname)
-  hostname =~ /\A(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\z/
+  hostname =~ /\A(([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])\z/
 end
 
 def get_grains(minion)
@@ -84,7 +84,7 @@ if __name__ == '__main__':
     print json.dumps(ret)
 EOF
 
-  result = IO.popen('python', mode='r+') do |python|
+  result = IO.popen('python 2>/dev/null', mode='r+') do |python|
     python.write script
     python.close_write
     result = python.read
@@ -146,6 +146,8 @@ def upload_grains(minion)
         res.cert = OpenSSL::X509::Certificate.new(File.read(SETTINGS[:ssl_cert]))
         res.key  = OpenSSL::PKey::RSA.new(File.read(SETTINGS[:ssl_key]), nil)
       end
+    elsif SETTINGS[:username] && SETTINGS[:password]
+      req.basic_auth(SETTINGS[:username], SETTINGS[:password])
     end
     res.start { |http| http.request(req) }
   rescue => e
@@ -170,6 +172,8 @@ def enc(minion)
       http.cert = OpenSSL::X509::Certificate.new(File.read(SETTINGS[:ssl_cert]))
       http.key  = OpenSSL::PKey::RSA.new(File.read(SETTINGS[:ssl_key]), nil)
     end
+  elsif SETTINGS[:username] && SETTING[:password]
+    req.basic_auth(SETTINGS[:username], SETTINGS[:password])
   end
 
   res = http.start { |http| http.request(req) }
@@ -185,12 +189,12 @@ begin
   result = ''
 
   if SETTINGS[:upload_grains]
-    timeout(SETTINGS[:timeout]) do
+    Timeout.timeout(SETTINGS[:timeout]) do
       upload_grains(minion)
     end
   end
 
-  timeout(SETTINGS[:timeout]) do
+  Timeout.timeout(SETTINGS[:timeout]) do
     result = enc(minion)
   end
   puts result

data/etc/foreman.yaml.example

@@ -2,9 +2,13 @@
 :proto: https
 :host: foreman.example.com
 :port: 443
+# if using http with ssl certificates
 :ssl_ca: "/var/lib/puppet/ssl/certs/ca.pem"
 :ssl_cert: "/var/lib/puppet/ssl/private_keys/foreman.example.com.pem"
 :ssl_key: "/var/lib/puppet/ssl/certs/foreman.example.com.pem"
+# if using http with username and password instead of https with certicates
+#:username: admin
+#:password: changeme
 :timeout:  10
 :salt:  /usr/bin/salt
 :upload_grains:  true

data/lib/smart_proxy_salt/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module Salt
-    VERSION = '2.1.6'
+    VERSION = '2.1.7'
   end
 end

data/sbin/upload-salt-reports

@@ -7,10 +7,12 @@ LOCK_FILE = '/var/lock/salt-report-upload.lock'
 
 import urllib
 import httplib
+import ssl
 import json
 import yaml
 import os
 import sys
+import base64
 
 import traceback
 
@@ -95,12 +97,19 @@ def upload(jobs):
                'Content-Type': 'application/json'}
 
     if config[':proto'] == 'https':
+        ctx = ssl.create_default_context()
+        ctx.load_cert_chain(certfile=config[':ssl_cert'], keyfile=config[':ssl_key'])
+        if config[':ssl_ca']:
+          ctx.load_verify_locations(cafile=config[':ssl_ca'])
         connection = httplib.HTTPSConnection(config[':host'],
-                port=config[':port'], key_file=config[':ssl_key'],
-                cert_file=config[':ssl_cert'])
+                port=config[':port'], context=ctx)
     else:
         connection = httplib.HTTPConnection(config[':host'],
                 port=config[':port'])
+        if ':username' in config and ':password' in config:
+            token = base64.b64encode('{}:{}'.format(config[':username'],
+                                                    config[':password']))
+            headers['Authorization'] = 'Basic {}'.format(token)
 
     for id in jobs[0]:
         job = jobs[1][id]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_salt
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Michael Moll
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-25 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies: []
 description: SaltStack Plug-In for Foreman's Smart Proxy
 email: foreman-dev@googlegroups.com
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: SaltStack Plug-In for Foreman's Smart Proxy