ovpnmcgen.rb 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46fbf55958e663b0d989719e018d03c02e09a5ba
-  data.tar.gz: c8c37d5b2ed29586c50e35fbf4de216ec2a72d77
+  metadata.gz: 6ef44c3fa31e42f64bd986012e60ee32cb6ebb2f
+  data.tar.gz: 66afa4c68f2d00f6d2b502402ade0397cf5981d8
 SHA512:
-  metadata.gz: 1590088cd9aee76d9334e554d68aae6daafd97b0eb4d109403af03dbbf40972690c82fac0b30b15f7ed2942d382cf117f970b43f49622e00136ab5b5e6ae963e
-  data.tar.gz: a611b7db6ed827eca83605df6087bbcf1754b87865fbdd4eda0bf012ab42f5a7fe6c8b10e451e7c16873d699e1f04c7efb3687036ff26bb80d8082458709988c
+  metadata.gz: 3f4ba7bb60994c9cd443617b0ec24d5e8ebef7b53dd3cf28aae74475f12ca12c01dad9d2954bd199868272cabadc1170b906ef26307625b613f08090e64ccf09
+  data.tar.gz: 3a3f40a2d17f28f25683e37d51a15c732937768b5d8a540c44c996740d445b44ae66b0a98c72d2893fc59508706451d50e5e70566196f244fc8eec57b12ed7dd

data/ChangeLog

@@ -1,6 +1,11 @@
-= 0.4.0 / 2014-05-04
+= 0.4.1 / 2014-05-07
+	* Bugfix: SSIDs specified as a string in configfile now correctly output
+	as arrays. (#a9e638)
+
+= 0.4.0 / 2014-05-07
 	* VoD rules in `--[un]trusted-ssids` to also use `InterfaceTypeMatch`.
-	* Added support for configuration persistance, via ENV or ~/.ovpnmcgen.rb.yml or `--config` flag.
+	* Added support for configuration persistance, via ENV or
+	~/.ovpnmcgen.rb.yml or `--config` flag.
 
 = 0.3.0 / 2014-05-04
 	* Documentation updates.

data/README.md

@@ -70,6 +70,17 @@ Option flags can be set using environment variables or placed into a YAML format
 
 Note: Only for YAML configuration files and environment variables, flags with hyphens (-) are replaced with underscores (_), i.e. `--trusted-ssids safe` should be `trusted_ssids: safe`.
 
+Sample:
+
+```
+untrusted_ssids: [dangerous1, dangerous2]
+trusted_ssids: [trust]
+host: vpn.example.com
+cafile: /etc/openvpn/ca.crt
+tafile: /etc/openvpn/ta.key
+url_probe: https://vpn.example.com/canVPN.php
+```
+
 ### Security Levels
 
 There are three different security levels to choose from, 'paranoid', 'high' (default), and 'medium'. The algorithm illustrated above is for 'high'.

data/features/gen_configfile.feature

@@ -35,6 +35,35 @@ Feature: Generate Functionality with Configuration File
 		Then the output should contain "error: "
 		And the output should not contain "error: Host"
 
+	Scenario: Single SSIDs specified should appear as an array in the output.
+		Given a file named ".ovpnmcgen.rb.yml" with:
+			"""
+			trusted_ssids: trust
+			"""
+		When I run `ovpnmcgen.rb g --host aruba.cucumber.org --cafile ca.crt --p12file p12file.p12 cucumber aruba`
+		Then the output should match:
+			"""
+			<key>SSIDMatch</key>
+			\s*<array>
+			\s*<string>trust</string>
+			\s*</array>
+			"""
+
+	Scenario: Multiple SSIDs specified should appear as an array in the output.
+		Given a file named ".ovpnmcgen.rb.yml" with:
+			"""
+			trusted_ssids: [trust1, trust2]
+			"""
+		When I run `ovpnmcgen.rb g --host aruba.cucumber.org --cafile ca.crt --p12file p12file.p12 cucumber aruba`
+		Then the output should match:
+			"""
+			<key>SSIDMatch</key>
+			\s*<array>
+			\s*<string>trust1</string>
+			\s*<string>trust2</string>
+			\s*</array>
+			"""
+
 	Scenario: Flags should override configuration file options.
 		Given a file named ".ovpnmcgen.rb.yml" with:
 			"""

data/lib/ovpnmcgen/config.rb

@@ -10,8 +10,6 @@ module Ovpnmcgen
     @@config = AppConfiguration.new filename do
       prefix 'og'
     end
-
-    # @@config = AppConfiguration[:ovpnmcgen]
   end
 
   def config

data/lib/ovpnmcgen/version.rb

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

data/lib/ovpnmcgen.rb

@@ -18,6 +18,10 @@ module Ovpnmcgen
     trusted_ssids = inputs[:trusted_ssids] || false
     untrusted_ssids = inputs[:untrusted_ssids] || false
 
+    # Ensure [un]trusted_ssids are Arrays.
+    trusted_ssids = Array(trusted_ssids) if trusted_ssids
+    untrusted_ssids = Array(untrusted_ssids) if untrusted_ssids
+
     begin
       ca_cert = File.readlines(inputs[:cafile]).map { |x| x.chomp }.join('\n')
     rescue Errno::ENOENT

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovpnmcgen.rb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ronald Ip