ovpnmcgen.rb 0.6.0.pre2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c085986407fc002975286f5c5e8edab03ff3aa4b
-  data.tar.gz: 0d721be5adeb09fd4415afc796f5d89154351a04
+  metadata.gz: bd0b2f4339b1794b85242203dd089e8c9d06e6a4
+  data.tar.gz: '09a598c3fc4b1393135af9868bada7ea087ae4c8'
 SHA512:
-  metadata.gz: 86354f3d257b6b49055e24178942b0711752998dcb05f502339d93d490e5612071210e1bf8a708284da226a1a4f495a7735a51521c1e1c9bdb5d3a2273de69bf
-  data.tar.gz: 2bcde9b9b1743827d8260860b4f45554bfc63b97260592be0b05adf03697cab1062f177c1e30d02bbfe4d08031798dac2b4e7ac6e257be6d9aaf7b5f7ef55a9d
+  metadata.gz: 6805822be455ed2a9466f33b9fe2a37bb7f33a218d83969e9ad267d8e5c18ffa65389e3e8ab1759733c4ed0be6a9295f3afb039010af0b6ea064d3a0c9fa0455
+  data.tar.gz: ebdbfb12e33264706b61a797c04633066869d020714bfa3a9f0c8826da1bf23d686f8d93d2f6ed610819c519d922bb6149dde5ff65dc164d043b9622b50a1cc8

data/ChangeLog

@@ -1,4 +1,4 @@
-= 0.6.0 / Unreleased
+= 0.6.0 / 2018-01-27
 	* Added support for `EvaluateConnection`, `Domains`, via `--domains`. It will include an `ActionParameters` dict containing `Domains`, and if `--domain-probe-url` is set, also contains `RequiredURLStringProbe`.
 	* Added support for updated bundle identifier (VPNSubType) `net.openvpn.connect.app` (changed since OpenVPN Connect 1.2.x), via `--v12compat`.
 	* Added support for `--cert` and `--key` for inline attachment of certificate and key, to workaround bug in OpenVPN Connect 1.2.5.

data/README.md

@@ -9,6 +9,16 @@ OpenVPN iOS Configuration Profile Utility
 
 Generates iOS configuration profiles (.mobileconfig) that configures OpenVPN for use with VPN-on-Demand that are not accessible through the Apple Configurator or the iPhone Configuration Utility.
 
+---
+
+**OpenVPN Connect (iOS) v1.2.x**: 
+- Breaking changes: enable the `--v12compat` switch.
+- Bug/workaround: enable the `--cert` & `--key` switches as necessary.
+
+Refer to [known issues](#known-issues) below for more details.
+
+---
+
 Although there are many possible VPN-on-Demand (VoD) triggers, this utility currently only implements `SSIDMatch`, `InterfaceTypeMatch`, and optionally `URLStringProbe`. For 'high' (default) security level, the following algorithm is executed upon network changes, in order:
 
 - If wireless SSID matches any specified with `--trusted-ssids`, tear down the VPN connection and do not reconnect on demand.
@@ -54,8 +64,11 @@ Usage: ovpnmcgen.rb generate [options] <user> <device>
     -p, --port PORT      OpenVPN server port. [Default: 1194]
     --p12file FILE       Path to user PKCS#12 file.
     --p12pass PASSWORD   Password to unlock PKCS#12 file.
-    --[no-]vod           Enable or Disable VPN-On-Demand. [Default: Enabled]
-    --v12compat          Enable OpenVPN Connect 1.2.x compatibility. [Default: Disabled]
+    --[no-]vod           Enable or Disable VPN-On-Demand. 
+                         When Disabled, sets `vpn-on-demand: 0`, so that OpenVPN Connect can control this profile. [Default: Enabled]
+    --v12compat          Enable OpenVPN Connect 1.2.x compatibility. 
+                         When Enabled, use updated `VPNSubType: net.openvpn.connect.app` 
+                         (changed since OpenVPN Connect 1.2.x). [Default: Disabled]
     --security-level LEVEL Security level of VPN-On-Demand Behaviour: paranoid, high, medium. [Default: high]
     --vpn-uuid UUID      Override a VPN configuration payload UUID.
     --profile-uuid UUID  Override a Profile UUID.
@@ -125,10 +138,15 @@ However, if there are certain sensitive public sites (or blocked sites) that you
 ## Examples
 
 ### Typical Usage
-	$ ovpnmcgen.rb gen --trusted-ssids home --host vpn.example.com \
-	--cafile path/to/ca.pem --tafile path/to/ta.key \
+	$ ovpnmcgen.rb gen --v12compat \
+	--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
+	--p12file path/to/john-ipad.p12 \
+	--p12pass p12passphrase \
+	john ipad
 
 Output:
 
@@ -203,7 +221,7 @@ Output:
 				<string>DEFAULT</string>
 			</dict>
 			<key>VPNSubType</key>
-			<string>net.openvpn.OpenVPN-Connect.vpnplugin</string>
+			<string>net.openvpn.connect.app</string>
 			<key>VPNType</key>
 			<string>VPN</string>
 			<key>VendorConfig</key>
@@ -282,10 +300,16 @@ 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 \
+	$ ovpnmcgen.rb gen --v12compat \
+	--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
+	--p12file path/to/john-ipad.p12 \
+	--p12pass p12passphrase \
+	john ipad
 
 Output similar to above:
 

data/Rakefile

@@ -7,4 +7,8 @@ end
 desc "Run cucumber tests"
 task :test => :cucumber
 
+namespace :pre_commit do
+	task :ci => [:test]
+end
+
 task :default => :test

data/bin/ovpnmcgen.rb

@@ -7,7 +7,7 @@ require 'ovpnmcgen/config'
 program :version, Ovpnmcgen::VERSION
 program :description, Ovpnmcgen::SUMMARY
 program :help, 'Usage', 'ovpnmcgen.rb <command> [options] <args...>'
-program :help_formatter, :compact
+program :help_formatter, Commander::HelpFormatter::Terminal
 default_command :help
 never_trace!
 global_option '-c', '--config FILE', 'Specify path to config file. [Default: .ovpnmcgen.rb.yml]'
@@ -16,8 +16,8 @@ command :generate do |c|
   c.syntax = 'ovpnmcgen.rb generate [options] <user> <device>'
   c.summary = 'Generates iOS Configuration Profiles (.mobileconfig)'
   c.description = 'Generates iOS configuration profiles (.mobileconfig) that configures OpenVPN for use with VPN-on-Demand that are not accessible through the Apple Configurator or the iPhone Configuration Utility.'
-  c.example 'Typical Usage', 'ovpnmcgen.rb gen --trusted-ssids home --host vpn.example.com --cafile path/to/ca.pem --tafile path/to/ta.key --p12file path/to/john-ipad.p12 --p12pass p12passphrase john ipad'
-  c.example '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 --p12file path/to/john-ipad.p12 --p12pass p12passphrase john ipad'
+  c.example 'Typical Usage', 'ovpnmcgen.rb gen --v12compat --trusted-ssids home --host vpn.example.com --cafile path/to/ca.pem --tafile path/to/ta.key --p12file path/to/john-ipad.p12 --p12pass p12passphrase john ipad'
+  c.example 'Extended Usage', 'ovpnmcgen.rb gen --v12compat --trusted-ssids home,school --untrusted-ssids virusnet --host vpn.example.com --cafile path/to/ca.pem --tafile path/to/ta.key --p12file path/to/john-ipad.p12 --p12pass p12passphrase john ipad'
   c.example 'Using OpenSSL to convert files into PKCS#12 (.p12)', 'openssl pkcs12 -export -out path/to/john-ipad.p12 -inkey path/to/john-ipad.key -in path/to/john-ipad.crt -passout pass:p12passphrase -name john-ipad@vpn.example.com'
   c.example 'Using OpenSSL to convert from PKCS#12 (.p12) to Cert PEM file', 'openssl pkcs12 -in path/to/john-ipad.p12 -out path/to/john-ipad-cert.crt -nodes -nokeys'
   c.example 'Using OpenSSL to convert from PKCS#12 (.p12) to Key PEM file', 'openssl pkcs12 -in path/to/john-ipad.p12 -out path/to/john-ipad-key.pem -nodes -nocerts'
@@ -30,8 +30,8 @@ command :generate do |c|
   c.option '-p', '--port PORT', 'OpenVPN server port. [Default: 1194]'
   c.option '--p12file FILE', 'Path to user PKCS#12 file. (Required)'
   c.option '--p12pass PASSWORD', 'Password to unlock PKCS#12 file.'
-  c.option '--[no-]vod', 'Enable or Disable VPN-On-Demand. [Default: Enabled]'
-  c.option '--v12compat', 'Enable OpenVPN Connect 1.2.x compatibility. [Default: Disabled]'
+  c.option '--[no-]vod', 'Enable or Disable VPN-On-Demand. When Disabled, sets `vpn-on-demand: 0`, so that OpenVPN Connect can control this profile. [Default: Enabled]'
+  c.option '--v12compat', 'Enable OpenVPN Connect 1.2.x compatibility. When Enabled, use updated `VPNSubType: net.openvpn.connect.app` (changed since OpenVPN Connect 1.2.x). [Default: Disabled]'
   c.option '--security-level LEVEL', 'Security level of VPN-On-Demand Behaviour: paranoid, high, medium. [Default: high]'
   c.option '--vpn-uuid UUID', 'Override a VPN configuration payload UUID.'
   c.option '--profile-uuid UUID', 'Override a Profile UUID.'

data/config/pre_commit.yml

@@ -0,0 +1,13 @@
+---
+:checks_remove:
+- :common
+- :rails
+:checks_add:
+- :merge_conflict
+- :yaml
+:warnings_remove: []
+:warnings_add:
+- :tabs
+- :nb_space
+- :whitespace
+- :ci

data/features/gen_basic.feature

@@ -33,7 +33,7 @@ Feature: Basic Generate Functionality
 
 	Scenario: I need help
 		When I run `ovpnmcgen.rb help g`
-		Then the output should contain "Usage:"
+		Then the output should contain "Usage"
 
 	Scenario: Missing 2 arguments
 		When I run `ovpnmcgen.rb g`

data/lib/ovpnmcgen/version.rb

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

data/ovpnmcgen.rb.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "aruba", "~> 0.5", ">= 0.5.4"
+  spec.add_development_dependency "pre-commit"
   spec.add_runtime_dependency     "plist", "~> 3.1", ">= 3.1.0"
   spec.add_runtime_dependency     "commander", "~> 4.1", ">= 4.1.6"
   spec.add_runtime_dependency     "app_configuration", "~> 0.0", ">= 0.0.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ovpnmcgen.rb
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre2
+  version: 0.6.0
 platform: ruby
 authors:
 - Ronald Ip
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-13 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.4
+- !ruby/object:Gem::Dependency
+  name: pre-commit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,7 @@ files:
 - README.md
 - Rakefile
 - bin/ovpnmcgen.rb
+- config/pre_commit.yml
 - features/gen_basic.feature
 - features/gen_configfile.feature
 - features/gen_ovpnconfigfile_input.feature
@@ -161,9 +176,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14