WiKID 3.0.2 → 3.2.3

data/lib/WiKID_version.rb

@@ -0,0 +1,5 @@
+module WiKID
+  class Auth
+    VERSION = "3.2.3"
+  end
+end

data/share/data/WiKID-ca.pem

@@ -0,0 +1,39 @@
+-----BEGIN CERTIFICATE-----
+MIIG4jCCBMqgAwIBAgIBAjANBgkqhkiG9w0BAQQFADCBpTEiMCAGCSqGSIb3DQEJ
+ARYTY2FAd2lraWRzeXN0ZW1zLmNvbTELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB0dl
+b3JnaWExEDAOBgNVBAcMB0F0bGFudGExGjAYBgNVBAoMEVdpS0lEIFN5c3RlbXMg
+SW5jMRQwEgYDVQQLDAtDQSBTZXJ2aWNlczEcMBoGA1UEAwwTY2Eud2lraWRzeXN0
+ZW1zLmNvbTAeFw0xMzA0MTcxMTQzMzhaFw0yMzA0MTcxMTQzMzhaMIGlMSIwIAYJ
+KoZIhvcNAQkBFhNjYUB3aWtpZHN5c3RlbXMuY29tMQswCQYDVQQGEwJVUzEQMA4G
+A1UECAwHR2VvcmdpYTEQMA4GA1UEBwwHQXRsYW50YTEaMBgGA1UECgwRV2lLSUQg
+U3lzdGVtcyBJbmMxFDASBgNVBAsMC0NBIFNlcnZpY2VzMRwwGgYDVQQDDBNjYS53
+aWtpZHN5c3RlbXMuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA
+qFrO3TUybKfA38FH7rXhQEMnpy+59vwZJns6j8NcYyyUbeEZXY8vQ7VSCLjro7bF
+wBbAAvt3z+XWPWwqS7njtmm4H8b1xnwp2waBooXawCY0GWKsD6sRUmA42E3y++li
++J/mz2BrdZ/srWxh5wyrn/TkgzBlRUgwbF6qKPb14l9NhPi8MtWfrrqkdBYsBZFd
+MW6vTj/pDusQwWxxQKf4tIWM2mOoB51YKJqLiNr4i7Ke3vqErz5EsTTl2Srbuxqr
+jo45XV7JaB4lsxecbm1mQmWo1e5n37EEVSwj8H64H7b59/n//eGQGSZjs2vAyzUe
+A0QAluYjioMXX1yg52dHCBtmqseDfamhCZ9MyqwSqFu/w6vFbFvqZQns7NoUxWar
+736Wp6+IfpnO7irD/EeP6JZOgX+TV1ZyjEyEf5oDutsfTx8Zn+OG2vR9/7nfHnYo
+3yZYX6Nj8qWcODuCSzpBD5RSMsmYSf53YM3OTCo1xAq0f3C9t4syGmaQDidGR8Mr
+OOhDF0rtSHgi8EXqBgA4KT/KXcoogLnlMSxy4TUq7l0wrUVZ4STMXhG7MWK49g0w
+DqY/mhQ1GcJyBQ89ClGajsGiA90DIjnVVLRHaDvy5bKEgJigUdpC/kf9W0IO025k
+KtaptwHi6SMsSKbCRhr5dsew4Q6CW6YTwXIwDjrPuKUCAwEAAaOCARkwggEVMB0G
+A1UdDgQWBBT+OIb6dSVaXUQ8D5ApW5lzz0yhOzARBglghkgBhvhCAQEEBAMCBkAw
+DAYDVR0TBAUwAwEB/zCB0gYDVR0jBIHKMIHHgBT+OIb6dSVaXUQ8D5ApW5lzz0yh
+O6GBq6SBqDCBpTEiMCAGCSqGSIb3DQEJARYTY2FAd2lraWRzeXN0ZW1zLmNvbTEL
+MAkGA1UEBhMCVVMxEDAOBgNVBAgTB0dlb3JnaWExEDAOBgNVBAcTB0F0bGFudGEx
+GjAYBgNVBAoTEVdpS0lEIFN5c3RlbXMgSW5jMRQwEgYDVQQLEwtDQSBTZXJ2aWNl
+czEcMBoGA1UEAxMTY2Eud2lraWRzeXN0ZW1zLmNvbYIBAjANBgkqhkiG9w0BAQQF
+AAOCAgEAHDO4GqAB0u3DlcgrFmqJghJoUTNMz1EkyvrZui/Q0qp5V5fu5CoKdwuZ
+r1iitBUW0rhn83CEZ5efFQu6ua7YdHsxpD4jX3OBjrCELQOAYEGiZd1G8EupfEU4
+4JTAY2LlANToITmOTslzVwCJ5znGlPEjLF2xYF3xMAH8zqkhfFeZi+xDPcdgpUmk
+lT2YUn3FZMxXMV6h8ANw72iCMON82uifBMsVQ3G/MG0qFCyeiYqj9gYMDO8yXqTM
+ftuy4UBOOBWHJWpTy7JXlaYyLcEVJXeq92KH/MwHaG6xpyT8CyPGZpv4yyaNE9YO
+f9g3XbEWUa5eHWo0qVVmf4tF3wfyG/gQ/TdFVJHcqGTpPtLmumM49+Bbbd/Ohoea
+3Jc1ZwPIxu/W76bs0ZK530me8vzq0Wzo2cKc77gi2zByasdMh6hwY4Q7oYeh6kqh
+fLq3dc3Hv5jgzU2ivbkOnyFs6wxLjub+Gklkg65IKyYMLIG/OVDuns3kUnJnXO+i
+Kkol7KbkxI3oZypsOqXMUFZ+4TYUMs+xWSD2kmi3Vp/XaiUiaiZ3ZTIbHpnqK6HC
+sFcMy5yGnNYJqudi5ZfbYuvVLJcqj1q6xY8+b/4bgbingKH2v97uBSePp+Mb6Sol
+qoln8zxXi9eQMDI+rfAZtpztGXcwlyjpuyivCFnYm+jftz3gEwk=
+-----END CERTIFICATE-----

data/test-options-dist.rb

@@ -0,0 +1,10 @@
+## rename to test-options.rb and set the parameter per your environment
+
+DOMAIN_CODE = "127000000001"
+SERVER_HOST = "127.0.0.1"
+SERVER_PORT = 8388
+
+CLIENT_KEY_FILE = File.join(File.dirname(__FILE__), 'network-client.pem')
+CLIENT_KEY_PASS = 'changeme'
+
+JCMD_REGISTER = "java -cp lib/wikidtoken-3.1.23.jar:lib/wikid-tokentest.jar com.wikidsystems.test.JavaSETokenTester register"

data/test/ts_load_wikid.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+
+class TestLoadWiKID < Test::Unit::TestCase
+
+  def test_load_module
+
+    $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+
+    begin
+      require 'WiKID'
+      loaded = 1
+    rescue
+      loaded = 0
+    end
+    assert(loaded == 1, "Unable to load WiKID module!")
+
+  end
+
+end

data/test/ts_wikid.rb

@@ -1,52 +1,206 @@
 #!/usr/bin/env ruby
 
 require 'test/unit'
-# $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require 'WiKID'
+require 'SecureRandom'
+require 'rexml/document'
+include REXML
+
+TEST_OPTIONS_FILE = File.join(File.dirname(__FILE__), "..", "test-options.rb")
+config_file_exists = FileTest.exists?(TEST_OPTIONS_FILE)
+if config_file_exists
+  require TEST_OPTIONS_FILE
+end
+
+SERVER_HOST = "127.0.0.1" if !defined?(SERVER_HOST)
+DOMAIN_CODE = "127000000001" if !defined?(DOMAIN_CODE)
+SERVER_PORT = 8388 if !defined?(SERVER_PORT)
+CLIENT_KEY_FILE = '' if !defined?(CLIENT_KEY_FILE)
+CLIENT_KEY_PASS = '' if !defined?(CLIENT_KEY_PASS)
+
+puts "* Running with server: #{SERVER_HOST}:#{SERVER_PORT}"
 
 class TestWiKID < Test::Unit::TestCase
 
-	def test_001_rubygems
+  def test_init_module
+
+    wc = WiKID::Auth.new(SERVER_HOST, SERVER_PORT, CLIENT_KEY_FILE, CLIENT_KEY_PASS)
+
+    assert_not_nil(wc, "WiKID module successfully loaded!")
+
+  end
+
+  def test_check_keys
+
+    wc = WiKID::Auth.new(SERVER_HOST, SERVER_PORT, CLIENT_KEY_FILE, CLIENT_KEY_PASS)
+    assert_nothing_raised do
+
+      wc.checkKeys()
+    end
+  end
+
+  def test_invalid_user_registration
+
+    username = 'test'
+    domaincode = DOMAIN_CODE
+
+    wc = WiKID::Auth.new(SERVER_HOST, SERVER_PORT, CLIENT_KEY_FILE, CLIENT_KEY_PASS)
+
+    regcode = ""
+    result = wc.registerUsername(username, regcode, domaincode)
+    assert_not_equal(0, result, "Properly failed to register user")
+
+  end
+
+  def test_valid_user_registration
+
+    username = 'test-' + SecureRandom.uuid
+    domaincode = DOMAIN_CODE
+
+    wc = WiKID::Auth.new(SERVER_HOST, SERVER_PORT, CLIENT_KEY_FILE, CLIENT_KEY_PASS)
+
+    output=`#{JCMD_REGISTER} #{DOMAIN_CODE}`
+    matches = /code=(\w+)/.match(output)
+    regcode = matches[1] || ''
+    result = wc.registerUsername(username, regcode, DOMAIN_CODE)
+
+    assert_equal(0, result, "Failed to register user")
+
+    # cleanup
+    wc.deleteUser(username, domaincode)
+
+  end
+
+  def test_invalid_pin
+
+  end
+
+  def test_valid_pin
+
+  end
+
+  def test_find_user
+
+    username = 'test-' + SecureRandom.uuid
+    domaincode = DOMAIN_CODE
+
+    wc = WiKID::Auth.new(SERVER_HOST, SERVER_PORT, CLIENT_KEY_FILE, CLIENT_KEY_PASS)
+
+    output=`#{JCMD_REGISTER} #{DOMAIN_CODE}`
+    matches = /code=(\w+)/.match(output)
+    regcode = matches[1] || ''
+    result = wc.registerUsername(username, regcode, DOMAIN_CODE)
+
+    user_xml = wc.findUser(username, domaincode)
+
+    user_id = XPath.first(user_xml, '//user-id/text()')
+
+    assert_equal(user_id, username, "Failed to lookup user")
+
+    # cleanup
+    wc.deleteUser(username, domaincode)
+
+  end
+
+
+  def test_update_user
+
+    username = 'test-' + SecureRandom.uuid
+    domaincode = DOMAIN_CODE
+
+    wc = WiKID::Auth.new(SERVER_HOST, SERVER_PORT, CLIENT_KEY_FILE, CLIENT_KEY_PASS)
+
+    output=`#{JCMD_REGISTER} #{DOMAIN_CODE}`
+    matches = /code=(\w+)/.match(output)
+    regcode = matches[1] || ''
+    wc.registerUsername(username, regcode, DOMAIN_CODE)
+
+    ## get the XML string to modify with
+    user_xml = wc.findUser(username, domaincode)
+
+    ## 1. modify the number of bad attempts
+    attempts = XPath.first(user_xml, '//bad-passcode-attempts/text()')
+    assert_equal(0, attempts, "Number of bad attempts is aleady non-zero!")
+
+    user_xml.elements['bad-passcode-attempts'].text = 2
+
+    result = wc.updateUser(username, domaincode, user_xml)
+    assert_equal(true, result, "Failed to modify the number of bad attempts!")
+
+    user_xml = wc.findUser(username, domaincode)
+    attempts = XPath.first(user_xml, '//bad-passcode-attempts/text()')
+    assert_equal(2, attempts, "Failed to correctly set the the number of bad attempts!")
+
+    ## 2. modify the user status
+    status = XPath.first(user_xml, '//status/text()')
+    assert_equal(1, status, "Status is already disabled!")
+
+    user_xml.elements['status'].text = 0
+
+    result = wc.updateUser(username, domaincode, user_xml)
+    assert_equal(true, result, "Failed to modify the status!")
+
+    user_xml = wc.findUser(username, domaincode)
+    status = XPath.first(user_xml, '//status/text()')
+    assert_equal(0, status, "Failed to modify the status value!")
+
+    ## 3. modify the user note
+    note = XPath.first(user_xml, '//note/text()')
+    assert_equal('', note.to_s, "Note is already non-empty!")
+
+    new_note_text = "This is a test note"
+    user_xml.elements['note'].text = new_note_text
+
+    result = wc.updateUser(username, domaincode, user_xml)
+    assert_equal(true, result, "Failed to modify the note!")
+
+    user_xml = wc.findUser(username, domaincode)
+    note = XPath.first(user_xml, '//note/text()')
+    assert_equal(new_note_text, note.to_s, "Failed to modity the note value!")
+
+    # cleanup
+    wc.deleteUser(username, domaincode)
+
+  end
+
+  def test_delete_unknown_user
+
+    username = 'junk-test-' + SecureRandom.uuid
+    domaincode = DOMAIN_CODE
+
+    wc = WiKID::Auth.new(SERVER_HOST, SERVER_PORT, CLIENT_KEY_FILE, CLIENT_KEY_PASS)
+
+    result = wc.deleteUser(username, domaincode)
+
+    assert_equal(false, result, "Unable to delete unknown user")
+
+    # cleanup
+    wc.deleteUser(username, domaincode)
 
-		begin
-			require 'rubygems'
-			loaded = 1
-		rescue Exception
-			# puts "WARNING: RubyGems not installed"
-			loaded = 0
-		end
-		assert(loaded == 1, "Unable to load RubyGems!")
+  end
 
-		require 'rubygems/rubygems_version.rb'
-		# puts "Loaded RubyGems #{Gem::RubyGemsVersion} ..."
+  def test_delete_user
 
-		if (Gem::RubyGemsVersion <= '0.8.11')
-			 # puts "WARNING: RubyGems may need patching for a mod_ruby environment.  Please see doc/README for more details"
-		end
+    username = 'test-' + SecureRandom.uuid
+    domaincode = DOMAIN_CODE
 
-	end
+    wc = WiKID::Auth.new(SERVER_HOST, SERVER_PORT, CLIENT_KEY_FILE, CLIENT_KEY_PASS)
 
-	def test_002_load_module
+    output=`#{JCMD_REGISTER} #{DOMAIN_CODE}`
+    matches = /code=(\w+)/.match(output)
+    regcode = matches[1] || ''
+    wc.registerUsername(username, regcode, DOMAIN_CODE)
 
-		begin
-			require_gem 'WiKID'
-			loaded = 1
-		rescue
-			loaded = 0
-		end
-		assert(loaded == 1, "Unable to load WiKID module!")
+    result = wc.deleteUser(username, domaincode)
 
-	end
+    assert_equal(true, result, "Failed to delete user")
 
-	def test_003_init_module
+    user_xml = wc.findUser(username, domaincode)
 
-		server_host     = "127000000001"
-		server_port     = -1
-		client_key_file = "/path/to/nowhere.pem"
-		client_key_pass = "changeme"
+    assert_nil(user_xml, "User not deleted")
 
-		wc = WiKID::Auth.new(server_host, server_port, client_key_file, client_key_pass)
-		assert_not_nil(wc, "WiKID module successfully loaded!")
+  end
 
-	end
 
 end

metadata

@@ -1,60 +1,85 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: WiKID
-version: !ruby/object:Gem::Version 
-  version: 3.0.2
+version: !ruby/object:Gem::Version
+  version: 3.2.3
 platform: ruby
-authors: 
+authors:
 - Greg Haygood
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2008-04-13 00:00:00 -04:00
-default_executable: 
-dependencies: []
-
+date: 2015-02-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
 description: 
-email: ghaygood @nospam@ wikidsystems(dot)com
+email:
+- ghaygood@wikidsystems.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- doc/README
-files: 
-- lib/WiKID.rb
-- doc/example
-- doc/rubygems-0.8.11.security-patch.diff
+extra_rdoc_files: []
+files:
+- doc/LICENSE.txt
 - doc/MANIFEST
 - doc/README
-- doc/LICENSE.txt
-- share/data
+- doc/rubygems-0.8.11.security-patch.diff
+- lib/WiKID.rb
+- lib/WiKID_version.rb
+- share/data/WiKID-ca.pem
+- test-options-dist.rb
+- test/ts_load_wikid.rb
 - test/ts_wikid.rb
-has_rdoc: true
-homepage: http://sourceforge.net/projects/wikid-twofactor
+homepage: https://rubygems.org/gems/WiKID
+licenses:
+- LGPL
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.9.3
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: wikid
-rubygems_version: 1.1.0
+rubyforge_project: 
+rubygems_version: 2.4.1
 signing_key: 
-specification_version: 2
+specification_version: 4
 summary: A network client module for the WiKID Strong Authentication system
-test_files: []
-
+test_files:
+- test/ts_load_wikid.rb
+- test/ts_wikid.rb
+has_rdoc: