ovpnmcgen.rb 0.4.2 → 0.5.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8d3f0580baa1a948a526b83986d6fd5c42f50ec
-  data.tar.gz: ebcf4f757ce5c1f46c00fde71db26b59c2ef913b
+  metadata.gz: e912d2080a544f817e2d2cb33bb27e05e29dfc7e
+  data.tar.gz: 58a420384ff00d67674250b21b692ed5875f15fc
 SHA512:
-  metadata.gz: 98012329bd990d08a71b8825d93a7fae52b8aff2645fbbf9fe519abf3b613ad4e11885aded0e08d94444da42bb11aa28b51c993c41c67a2c783266c98ba791c8
-  data.tar.gz: 31efba1f7f54a78099ea8eeb2d26cfa0aa0eb266d96d87b860dbecc19e13938e01565280ff46bff1bc0d34b2f0278bb910092f9a116c290ea0a1320b5fdd4af1
+  metadata.gz: fe4f9f4812a070d0fbf95256457592bf21850812d9bc61ee4fdf68b9c6ebdd109e9ba1a0bdd54c4ca3380454f2667adab6229ecb80326c03d23dc5f30b989f52
+  data.tar.gz: 7e42fb2134215286d41e7e2fcc488f0347b48f9f97ef8c46d89f097783606627aa44f5700006de3ae246e9bb85f8b146ac7275db6b4a73f602edca19225a9365

data/ChangeLog

@@ -1,3 +1,6 @@
+= 0.5.0.pre / 2015-01-24
+	* Specify multiple remotes with `--remotes "host2 1194 tcp","host3 1195 udp"` flag.
+
 = 0.4.2 / 2014-07-05
 	* Bugfix: Default catch-all rule should be 'Ignore', any other option does not make sense.
 

data/README.md

@@ -60,6 +60,7 @@ Usage: ovpnmcgen.rb generate [options] <user> <device>
     -t, --trusted-ssids SSIDS List of comma-separated trusted SSIDs.
     -u, --untrusted-ssids SSIDS List of comma-separated untrusted SSIDs.
     --url-probe URL      This URL must return HTTP status 200, without redirection, before the VPN service will try establishing.
+    --remotes REMOTES	List of comma-separated alternate remotes: "<host> <port> <proto>".
     --ovpnconfigfile FILE Path to OpenVPN client config file.
     -o, --output FILE    Output to file. [Default: stdout]
 ```
@@ -114,6 +115,7 @@ By enabling this option, you will need to reliably and quickly respond with HTTP
 ### Typical Usage
 	$ ovpnmcgen.rb gen --trusted-ssids home --host vpn.example.com \
 	--cafile path/to/ca.pem --tafile path/to/ta.key \
+	--url-probe http://vpn.example.com/status \
 	--p12file path/to/john-ipad.p12 --p12pass p12passphrase john ipad
 
 Output:
@@ -157,22 +159,30 @@ Output:
 						<array>
 							<string>home</string>
 						</array>
+						<key>URLStringProbe</key>
+						<string>http://vpn.example.com/status</string>
 					</dict>
 					<dict>
 						<key>Action</key>
 						<string>Connect</string>
 						<key>InterfaceTypeMatch</key>
 						<string>WiFi</string>
+						<key>URLStringProbe</key>
+						<string>http://vpn.example.com/status</string>
 					</dict>
 					<dict>
 						<key>Action</key>
 						<string>Ignore</string>
 						<key>InterfaceTypeMatch</key>
 						<string>Cellular</string>
+						<key>URLStringProbe</key>
+						<string>http://vpn.example.com/status</string>
 					</dict>
 					<dict>
 						<key>Action</key>
 						<string>Connect</string>
+						<key>URLStringProbe</key>
+						<string>http://vpn.example.com/status</string>
 					</dict>
 				</array>
 				<key>PayloadCertificateUUID</key>
@@ -262,6 +272,7 @@ Output:
 ### Extended Usage
 	$ ovpnmcgen.rb gen --trusted-ssids home,school --untrusted-ssids virusnet \
 	--host vpn.example.com --cafile path/to/ca.pem --tafile path/to/ta.key \
+	--url-probe http://vpn.example.com/status \
 	--p12file path/to/john-ipad.p12 --p12pass p12passphrase john ipad
 
 Output similar to above:
@@ -296,22 +307,30 @@ Output similar to above:
 						<array>
 							<string>virusnet</string>
 						</array>
+						<key>URLStringProbe</key>
+						<string>http://vpn.example.com/status</string>
 					</dict>
 					<dict>
 						<key>Action</key>
 						<string>Connect</string>
 						<key>InterfaceTypeMatch</key>
 						<string>WiFi</string>
+						<key>URLStringProbe</key>
+						<string>http://vpn.example.com/status</string>
 					</dict>
 					<dict>
 						<key>Action</key>
 						<string>Ignore</string>
 						<key>InterfaceTypeMatch</key>
 						<string>Cellular</string>
+						<key>URLStringProbe</key>
+						<string>http://vpn.example.com/status</string>
 					</dict>
 					<dict>
 						<key>Action</key>
 						<string>Connect</string>
+						<key>URLStringProbe</key>
+						<string>http://vpn.example.com/status</string>
 					</dict>
 				</array>
 				...
@@ -334,27 +353,31 @@ Output similar to above:
 
 - "Not connected to Internet" error/behaviour when VPN should be established.
 
-	Diagnosis: Load any site in Safari. An error message "Safari cannot open the page because your iPhone is not connected to the Internet" will be presented.
+	*Diagnosis*: Load any site in Safari. An error message "Safari cannot open the page because your iPhone is not connected to the Internet" will be presented.
 
 	There is a bug in the iOS/OS X network routing code that hangs the routing system, preventing the gateway or IP address from being set. This happens more frequently when the tunnel is brought up/down more frequently.
 
-	Workaround: Hard-restart iOS. Press and hold down both the home and sleep/wake buttons until iOS turns off and back on with the Apple boot up screen. Release when the Apple boot up screen appears.
+	*Solution*: Upgrade to iOS 8.1. The new iOS update seems to have mostly solved issues surrounding the networking stack.
+
+	*Workaround*: Hard-restart iOS. Press and hold down both the home and sleep/wake buttons until iOS turns off and back on with the Apple boot up screen. Release when the Apple boot up screen appears.
 
 - Weird Rapid Connecting…/Disconnected behaviour.
 
-	Diagnosis: VPN status in Settings.app rapid alternates between Connecting… and Disconnected.
+	*Diagnosis*: VPN status in Settings.app rapid alternates between Connecting… and Disconnected.
 
 	Usually happens when the VoD component is stuck in an infinite loop. Not sure what triggers it.
 
-	Workaround: Hard-restart iOS. Press and hold down both the home and sleep/wake buttons until iOS turns off and back on with the Apple boot up screen. Release when the Apple boot up screen appears.
+	*Solution*: Upgrade to iOS 8.1. The new iOS update seems to have mostly solved issues surrounding the networking stack.
+
+	*Workaround*: Hard-restart iOS. Press and hold down both the home and sleep/wake buttons until iOS turns off and back on with the Apple boot up screen. Release when the Apple boot up screen appears.
 
 - Cannot load Captive Portals (Hotspots on unsecured Wireless networks).
 
 	Some unsecured hotspots require navigating certain webpages before full access to the internet is available. This requirement blocks VPN connections and iOS will also block captive portal access, waiting on the VPN connection. This circular dependency results in no internet access.
 
-	Workaround: Manually disable VPN-on-Demand in Settings.app > VPN > Server (i) option screen. Reenable only after Internet access is available.
+	*Solution*: Implement `URLStringProbe` where, if and only if this URL is successfully fetched (returning a 200 HTTP status code) without redirection, will the VPN service be required, relied on, and brought up. Enable with the `--url-probe` flag.
 
-	Solution: Implement `URLStringProbe` where, if and only if this URL is successfully fetched (returning a 200 HTTP status code) without redirection, will the VPN service be required, relied on, and brought up. Enable with the `--url-probe` flag.
+	*Workaround*: Manually disable VPN-on-Demand in Settings.app > VPN > Server (i) option screen. Reenable only after Internet access is available.
 
 ## TODO
 

data/bin/ovpnmcgen.rb

@@ -34,6 +34,7 @@ command :generate do |c|
   c.option '-t', '--trusted-ssids SSIDS', Array, 'List of comma-separated trusted SSIDs.'
   c.option '-u', '--untrusted-ssids SSIDS', Array, 'List of comma-separated untrusted SSIDs.'
   c.option '--url-probe URL', 'This URL must return HTTP status 200, without redirection, before the VPN service will try establishing.'
+  c.option '--remotes REMOTES', Array, 'List of comma-separated alternate remotes: "<host> <port> <proto>".'
   c.option '--ovpnconfigfile FILE', 'Path to OpenVPN client config file.'
   c.option '-o', '--output FILE', 'Output to file. [Default: stdout]'
   c.action do |args, options|
@@ -85,6 +86,7 @@ command :generate do |c|
     inputs[:ovpnconfigfile] = options.ovpnconfigfile || config.ovpnconfigfile if options.ovpnconfigfile or config.ovpnconfigfile
     inputs[:tafile] = options.tafile || config.tafile if options.tafile or config.tafile
     inputs[:url_probe] = options.url_probe || config.url_probe if options.url_probe or config.url_probe
+    inputs[:remotes] = options.remotes || config.remotes if options.remotes or config.remotes
 
     unless options.output
       puts Ovpnmcgen.generate(inputs)

data/features/gen_basic.feature

@@ -221,4 +221,20 @@ Feature: Basic Generate Functionality
 			<?xml version="1.0" encoding="UTF-8"?>
 			<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 			<plist version="1.0">
-			"""
+			"""
+
+	Scenario: The remotes flag is set with multiple hosts.
+		When I run `ovpnmcgen.rb g --host aruba.cucumber.org --cafile ca.crt --p12file p12file.p12 --remotes "1.example.org 1195 tcp","2.example.org 1196 tcp" cucumber aruba`
+		Then the output should match:
+			"""
+			<key>remote.1</key>
+			\s*<string>aruba.cucumber.org 1194 udp</string>
+			"""
+		And the output should match:
+			"""
+			<key>remote.2</key>
+			\s*<string>1.example.org 1195 tcp</string>
+			\s*<key>remote.3</key>
+			\s*<string>2.example.org 1196 tcp</string>
+			"""
+		And the output should not contain "<key>remote</key>"

data/lib/ovpnmcgen.rb

@@ -17,10 +17,12 @@ module Ovpnmcgen
     p12pass = inputs[:p12pass] || ''
     trusted_ssids = inputs[:trusted_ssids] || false
     untrusted_ssids = inputs[:untrusted_ssids] || false
+    remotes = inputs[:remotes] || false
 
     # Ensure [un]trusted_ssids are Arrays.
     trusted_ssids = Array(trusted_ssids) if trusted_ssids
     untrusted_ssids = Array(untrusted_ssids) if untrusted_ssids
+    remotes = Array(remotes) if remotes
 
     begin
       ca_cert = File.readlines(inputs[:cafile]).map { |x| x.chomp }.join('\n')
@@ -53,7 +55,14 @@ module Ovpnmcgen
         'remote-cert-tls' => 'server'
       }
     end
-    ovpnconfighash['remote'] = "#{host} #{port} #{proto}"
+    if remotes
+      ovpnconfighash['remote.1'] = "#{host} #{port} #{proto}"
+      remotes.each_with_index do |r, i|
+        ovpnconfighash["remote.#{i+2}"] = r
+      end
+    else
+      ovpnconfighash['remote'] = "#{host} #{port} #{proto}"
+    end
     ovpnconfighash['ca'] = ca_cert
     ovpnconfighash['tls-auth'] = tls_auth if inputs[:tafile]
     ovpnconfighash['key-direction'] = '1' if inputs[:tafile]

data/lib/ovpnmcgen/version.rb

@@ -1,4 +1,4 @@
 module Ovpnmcgen
-  VERSION = "0.4.2"
+  VERSION = "0.5.0.pre"
   SUMMARY = "An OpenVPN iOS Configuration Profile (.mobileconfig) Utility"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ovpnmcgen.rb
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0.pre
 platform: ruby
 authors:
 - Ronald Ip
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-05 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,9 +162,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2