duostack 0.2.0 → 0.2.1

data/bin/duostack

@@ -28,8 +28,8 @@ $client = File.basename(__FILE__)
 module Duostack
   class Client
     
-    VERSION = '0.2.0'
-    DEPENDENCIES_LAST_MODIFIED = 1297154481
+    VERSION = '0.2.1'
+    DEPENDENCIES_LAST_MODIFIED = 1298683372
     USER_AGENT = "duostack-#{VERSION}"
     
     DEFAULTS = {
@@ -184,6 +184,15 @@ module Duostack
         exit_with "missing dependency, please install curl (http://curl.haxx.se/download.html)"
       end
       
+      # curl with --cacert flag (version >= 7.5)
+      version = `curl -V`.split.select { |s| s =~ /^(\d+\.)?(\d+\.)?(\d+\.)?(\*|\d+)$/ }.first # http://stackoverflow.com/questions/82064/a-regex-for-version-number-parsing
+      major, minor, patch = version.split('.').collect { |s| s.to_i } # split on dots and convert to ints
+      major, minor, patch = [major, minor, patch].collect { |v| v ||= 0 } # default each to 0
+      if major < 7 || (major == 7 && minor < 5)
+        exit_with "missing dependency, curl 7.5 or later is required (you have #{version})"
+      end
+      
+      
       # curl SSL
       # handled inside api_host method
       
@@ -236,7 +245,8 @@ module Duostack
     end
     
     def require_ssh_key
-      @ssh_key ||= `cat #{ssh_key_location}`.chomp
+      keyfile = ssh_key_location
+      @ssh_key ||= `cat #{keyfile}`.chomp if keyfile
       unless @ssh_key
         exit_with "an SSH key is required to run this command, please generate an SSH key and try again (http://docs.duostack.com/command-line-client#setup)"
       end
@@ -305,6 +315,11 @@ module Duostack
         
         # clean up argument
         argument = CGI::escape(argument)
+      else
+        # ensure we *don't* have any further arguments for list/clear which don't allow them
+        unless @args.empty?
+          exit_with("unrecognized argument: '#{@args.first}', run '#{@client} help #{@command}' for usage")
+        end
       end
       
       # finally, process action
@@ -366,6 +381,26 @@ module Duostack
       end
     end
     
+    def ca_cert_location
+      return @ca_cert_location if @ca_cert_location # easy memoization
+      
+      candidates = [
+        File.join($dir, '..', 'vendor', 'duostack-startcom.pem'), # gem packages
+        File.join($dir, '.duostack-startcom.pem')                 # npm, tgz packages
+      ]
+      
+      candidates.each do |filename|
+        if File.exist?(filename)
+          @ca_cert_location = filename
+          return filename
+        end
+      end
+      
+      # if we get to this point, the cert wasn't found
+      warn_with "custom certificate authority file not present, using system CA bundle"
+      return nil
+    end
+    
     def api_host
       @api_host ||= begin
         host = "https://duostack.duostack.net"
@@ -393,11 +428,14 @@ module Duostack
     end
     
     def curl_get(url, timeout=nil)
-      command = "curl -s#{'v' if ENV['DSDEBUG']} -A '#{USER_AGENT}' -w '\n%{http_code}' '#{url}'" # use w flag to append http status code
+      command = "curl -s -A '#{USER_AGENT}' -w '\n%{http_code}'" # use w flag to append http status code, set user-agent header
+      command += " --cacert #{ca_cert_location}" if ca_cert_location # use our own certificate if present
       command += " -m #{timeout}" if timeout
-      raw = `#{command}`
+      command += " -v" if ENV['DSDEBUG']
+      command += " '#{url}'" # finally, the actual URL to curl
       
       debug command
+      raw = `#{command}`
       debug raw
       
       # break apart the raw result and extract the HTTP status code, reassemble

data/vendor/duostack-startcom.pem

@@ -0,0 +1,44 @@
+-----BEGIN CERTIFICATE-----
+MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9
+MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
+U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
+cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
+pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
+Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
+Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
+HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
+Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
+Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
+26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
+AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
+FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j
+ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js
+LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM
+BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0
+Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy
+dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh
+cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh
+YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg
+dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp
+bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ
+YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT
+TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ
+9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8
+jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW
+FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz
+ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1
+ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L
+EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu
+L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
+yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC
+O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V
+um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh
+NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
+-----END CERTIFICATE-----

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: duostack
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Todd Eichel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 -05:00
+date: 2011-02-28 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - bin/.duostack-console-expect
 - bin/bash/.duostack-console-expect
 - bin/duostack
+- vendor/duostack-startcom.pem
 has_rdoc: true
 homepage: http://www.duostack.com/
 licenses: []