tlspretense 0.6.1 → 0.6.2

data/lib/tlspretense.rb

@@ -1,13 +1,14 @@
 require 'fileutils'
 
-require 'ssl_test'
-require 'certmaker'
-require 'certmaker/runner'
+require 'packetthief'
+require 'tlspretense/cert_maker/runner'
 
 module TLSPretense
   class CleanExitError < StandardError ; end
 
   autoload :App,        'tlspretense/app'
   autoload :InitRunner, 'tlspretense/init_runner'
+  autoload :TestHarness, 'tlspretense/test_harness'
   autoload :VERSION,    'tlspretense/version'
+  autoload :CertMaker,  'tlspretense/cert_maker'
 end

data/lib/tlspretense/app.rb

@@ -30,9 +30,9 @@ QUOTE
         when 'init'
           InitRunner.new(@action_args, @stdin, @stdout).run
         when 'run'
-          SSLTest::Runner.new(@action_args, @stdin, @stdout).run
+          TestHarness::Runner.new(@action_args, @stdin, @stdout).run
         when 'list', 'ls'
-          SSLTest::Runner.new(['--list'] + @action_args, @stdin, @stdout).run
+          TestHarness::Runner.new(['--list'] + @action_args, @stdin, @stdout).run
         when 'ca'
           CertMaker::Runner.new.ca
         when 'certs'

data/lib/{certmaker.rb → tlspretense/cert_maker.rb}

@@ -1,13 +1,14 @@
-
 require 'fileutils'
-require 'yaml'
 require 'openssl'
+require 'yaml'
 
-require 'certmaker/ext_core/hash_indifferent_fetch'
-require 'certmaker/certificate_factory'
-require 'certmaker/certificate_suite_generator'
+require 'tlspretense/ext_core/hash_indifferent_fetch'
 
-module CertMaker
+module TLSPretense
+  module CertMaker
+
+    autoload :CertificateFactory,         'tlspretense/cert_maker/certificate_factory'
+    autoload :CertificateSuiteGenerator,  'tlspretense/cert_maker/certificate_suite_generator'
 
 
   # Generate certificates and keys using +config+.
@@ -29,7 +30,7 @@ module CertMaker
   # Ensure that the custom ca exists.
   def make_ca(config, verbose=false)
     unless config['certmaker'].has_key? 'customgoodca'
-      puts "certmaker does not have a 'customgoodca' entry, so a CA will be regenerated every time."
+      puts "CertMaker does not have a 'customgoodca' entry, so a CA will be regenerated every time."
       return
     end
 
@@ -58,4 +59,6 @@ module CertMaker
     end
   end
   module_function :make_ca
+
+  end
 end

data/lib/{certmaker → tlspretense/cert_maker}/certificate_factory.rb

@@ -1,3 +1,4 @@
+module TLSPretense
 module CertMaker
   class CertificateFactory
 
@@ -104,3 +105,4 @@ module CertMaker
   end
 
 end
+end

data/lib/{certmaker → tlspretense/cert_maker}/certificate_suite_generator.rb

@@ -1,4 +1,4 @@
-
+module TLSPretense
 module CertMaker
   # Generates a suite of certificates from a configuration.
   #
@@ -118,3 +118,4 @@ module CertMaker
 
   end
 end
+end

data/lib/{certmaker → tlspretense/cert_maker}/runner.rb

@@ -1,7 +1,6 @@
-require 'certmaker'
-require 'yaml'
-require 'fileutils'
+require 'tlspretense/cert_maker'
 
+module TLSPretense
 module CertMaker
   class Runner
     include FileUtils
@@ -25,3 +24,4 @@ module CertMaker
     end
   end
 end
+end

data/lib/{certmaker → tlspretense/cert_maker}/tasks.rb

@@ -3,14 +3,14 @@ namespace :certs do
 
   desc "Checks for a CA, and generates it if needed."
   task :ca do
-    require 'certmaker/runner'
-    CertMaker::Runner.new.ca
+    require 'tlspretense/cert_maker/runner'
+    TLSPretense::CertMaker::Runner.new.ca
   end
 
   desc "Generate a suite of test certificates"
   task :generate => [ 'certs:ca' ] do
-    require 'certmaker/runner'
-    CertMaker::Runner.new.certs
+    require 'tlspretense/cert_maker/runner'
+    TLSPretense::CertMaker::Runner.new.certs
   end
 
   desc "Clean up by deleting the 'certs' directory."

data/lib/tlspretense/test_harness.rb

@@ -0,0 +1,24 @@
+require 'optparse'
+require 'logger'
+
+require 'eventmachine'
+require 'termios'
+
+require 'packetthief'
+require 'tlspretense/ext_core/io_raw_input'
+
+module TLSPretense
+  module TestHarness
+    autoload :AppContext,         'tlspretense/test_harness/app_context'
+    autoload :CertificateManager, 'tlspretense/test_harness/certificate_manager'
+    autoload :Config,             'tlspretense/test_harness/config'
+    autoload :InputHandler,       'tlspretense/test_harness/input_handler'
+    autoload :RunnerOptions,      'tlspretense/test_harness/runner_options'
+    autoload :Runner,             'tlspretense/test_harness/runner'
+    autoload :SSLTestCase,        'tlspretense/test_harness/ssl_test_case'
+    autoload :SSLTestReport,      'tlspretense/test_harness/ssl_test_report'
+    autoload :SSLTestResult,      'tlspretense/test_harness/ssl_test_result'
+    autoload :TestListener,       'tlspretense/test_harness/test_listener'
+    autoload :TestManager,        'tlspretense/test_harness/test_manager'
+  end
+end

data/lib/{ssl_test → tlspretense/test_harness}/app_context.rb

@@ -1,4 +1,5 @@
-module SSLTest
+module TLSPretense
+module TestHarness
 
   # Class to hold onto application-wide values in a single place and to track
   # application state.
@@ -15,3 +16,4 @@ module SSLTest
     end
   end
 end
+end

data/lib/{ssl_test → tlspretense/test_harness}/certificate_manager.rb

@@ -1,4 +1,5 @@
-module SSLTest
+module TLSPretense
+module TestHarness
   # Handles the loading and caching of certificates and private keys.
   class CertificateManager
 
@@ -31,3 +32,4 @@ module SSLTest
     end
   end
 end
+end

data/lib/{ssl_test → tlspretense/test_harness}/config.rb

@@ -1,4 +1,5 @@
-module SSLTest
+module TLSPretense
+module TestHarness
   # Loads and interprets the configuration file.
   class Config
 
@@ -77,3 +78,4 @@ module SSLTest
 
   end
 end
+end

data/lib/{ssl_test → tlspretense/test_harness}/input_handler.rb

@@ -1,6 +1,5 @@
-
-
-module SSLTest
+module TLSPretense
+module TestHarness
   # EM handler to handle keyboard input while a test is running.
   module InputHandler
 
@@ -33,3 +32,4 @@ module SSLTest
 
   end
 end
+end

data/lib/{ssl_test → tlspretense/test_harness}/runner.rb

@@ -1,4 +1,5 @@
-module SSLTest
+module TLSPretense
+module TestHarness
   # Handles a list of arguments, and uses the arguments to run a sequence of tests.
   class Runner
     include PacketThief::Logging
@@ -108,3 +109,4 @@ module SSLTest
 
   end
 end
+end

data/lib/{ssl_test → tlspretense/test_harness}/runner_options.rb

@@ -1,4 +1,6 @@
-module SSLTest
+module TLSPretense
+module TestHarness
+
   class RunnerOptions
 
     DEFAULT_OPTS = {
@@ -66,3 +68,4 @@ module SSLTest
 
   end
 end
+end

data/lib/{ssl_test → tlspretense/test_harness}/ssl_test_case.rb

@@ -1,4 +1,5 @@
-module SSLTest
+module TLSPretense
+module TestHarness
   # Represents a single test case.
   class SSLTestCase
     include PacketThief::Logging
@@ -44,3 +45,4 @@ module SSLTest
 
   end
 end
+end

data/lib/{ssl_test → tlspretense/test_harness}/ssl_test_report.rb

@@ -1,4 +1,5 @@
-module SSLTest
+module TLSPretense
+module TestHarness
   # Represents an entire report. SSLTestCases add results to it, which it can
   # later format.
   class SSLTestReport
@@ -22,3 +23,4 @@ module SSLTest
 
   end
 end
+end

data/lib/{ssl_test → tlspretense/test_harness}/ssl_test_result.rb

@@ -1,4 +1,5 @@
-module SSLTest
+module TLSPretense
+module TestHarness
   # SSLTestResults are created by running SSLTestCases. They are then added to
   # an SSLTestReport so that they can be included in that report.
   class SSLTestResult
@@ -28,3 +29,4 @@ module SSLTest
     end
   end
 end
+end

data/lib/{ssl_test → tlspretense/test_harness}/test_listener.rb

@@ -1,4 +1,5 @@
-module SSLTest
+module TLSPretense
+module TestHarness
 
   # TestListener is the real workhorse used by SSLTestCases. It builds on the
   # SSLSmartProxy from PacketThief in order to intercept and forward SSL
@@ -138,3 +139,4 @@ module SSLTest
 
   end
 end
+end

data/lib/{ssl_test → tlspretense/test_harness}/test_manager.rb

@@ -1,4 +1,5 @@
-module SSLTest
+module TLSPretense
+module TestHarness
   # Tracks testing state and handles reporting for the TestListener.
   class TestManager
     include PacketThief::Logging
@@ -114,3 +115,4 @@ module SSLTest
 
   end
 end
+end

data/lib/tlspretense/version.rb

@@ -1,3 +1,3 @@
 module TLSPretense
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/spec/{ssl_test → tlspretense/test_harness}/certificate_manager_spec.rb

@@ -1,6 +1,7 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','spec_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','spec_helper'))
 
-module SSLTest
+module TLSPretense
+module TestHarness
   describe CertificateManager do
     let(:rawfoocert) do (<<-EOF).gsub(/^\s*/,'')
       -----BEGIN CERTIFICATE-----
@@ -219,4 +220,4 @@ module SSLTest
 
   end
 end
-
+end

data/spec/{ssl_test → tlspretense/test_harness}/config_spec.rb

@@ -1,6 +1,7 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','spec_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','spec_helper'))
 
-module SSLTest
+module TLSPretense
+module TestHarness
   describe Config do
     let(:foo_test) do
       {
@@ -73,4 +74,4 @@ module SSLTest
 
   end
 end
-
+end

data/spec/{ssl_test → tlspretense/test_harness}/runner_spec.rb

@@ -1,6 +1,7 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','spec_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','spec_helper'))
 
-module SSLTest
+module TLSPretense
+module TestHarness
   describe Runner do
     let(:args) { [] }
     let(:stdin) { double("stdin") }
@@ -358,3 +359,4 @@ module SSLTest
 
   end
 end
+end

data/spec/{ssl_test → tlspretense/test_harness}/ssl_test_case_spec.rb

@@ -1,6 +1,7 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','spec_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','spec_helper'))
 
-module SSLTest
+module TLSPretense
+module TestHarness
   describe SSLTestCase do
     let(:certchain) { double('certchain') }
     let(:keychain) { [ double('firstkey'), double('secondkey'), double('cakey') ] }
@@ -109,5 +110,4 @@ module SSLTest
 
   end
 end
-
-
+end

data/spec/{ssl_test → tlspretense/test_harness}/test_listener_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','spec_helper'))
-require 'certmaker'
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','spec_helper'))
 
 # quick and dirty. just create the fields we need.
 def quickcertmaker(hostname, altnames=nil)
@@ -13,7 +12,8 @@ def quickcertmaker(hostname, altnames=nil)
 end
 
 
-module SSLTest
+module TLSPretense
+module TestHarness
   describe TestListener do
     let(:tcpsocket) { double('tcpsocket') }
     let(:cacert) { double('cacert') }
@@ -197,3 +197,4 @@ module SSLTest
 
   end
 end
+end

data/spec/{ssl_test → tlspretense/test_harness}/test_manager_spec.rb

@@ -1,6 +1,7 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','spec_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','spec_helper'))
 
-module SSLTest
+module TLSPretense
+module TestHarness
   describe TestManager do
 
     let(:config) do
@@ -322,3 +323,4 @@ module SSLTest
 
   end
 end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tlspretense
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -149,12 +149,6 @@ files:
 - bin/view.sh
 - doc/general_setup.rdoc
 - doc/linux_setup.rdoc
-- lib/certmaker.rb
-- lib/certmaker/certificate_factory.rb
-- lib/certmaker/certificate_suite_generator.rb
-- lib/certmaker/ext_core/hash_indifferent_fetch.rb
-- lib/certmaker/runner.rb
-- lib/certmaker/tasks.rb
 - lib/packetthief.rb
 - lib/packetthief/handlers.rb
 - lib/packetthief/handlers/abstract_ssl_handler.rb
@@ -173,25 +167,31 @@ files:
 - lib/packetthief/logging.rb
 - lib/packetthief/redirect_rule.rb
 - lib/packetthief/util.rb
-- lib/ssl_test.rb
-- lib/ssl_test/app_context.rb
-- lib/ssl_test/certificate_manager.rb
-- lib/ssl_test/config.rb
-- lib/ssl_test/ext_core/io_raw_input.rb
-- lib/ssl_test/input_handler.rb
-- lib/ssl_test/runner.rb
-- lib/ssl_test/runner_options.rb
-- lib/ssl_test/ssl_test_case.rb
-- lib/ssl_test/ssl_test_report.rb
-- lib/ssl_test/ssl_test_result.rb
-- lib/ssl_test/test_listener.rb
-- lib/ssl_test/test_manager.rb
 - lib/tlspretense.rb
 - lib/tlspretense/app.rb
+- lib/tlspretense/cert_maker.rb
+- lib/tlspretense/cert_maker/certificate_factory.rb
+- lib/tlspretense/cert_maker/certificate_suite_generator.rb
+- lib/tlspretense/cert_maker/runner.rb
+- lib/tlspretense/cert_maker/tasks.rb
+- lib/tlspretense/ext_core/hash_indifferent_fetch.rb
+- lib/tlspretense/ext_core/io_raw_input.rb
 - lib/tlspretense/init_runner.rb
 - lib/tlspretense/skel/ca/goodcacert.pem
 - lib/tlspretense/skel/ca/goodcakey.pem
 - lib/tlspretense/skel/config.yml
+- lib/tlspretense/test_harness.rb
+- lib/tlspretense/test_harness/app_context.rb
+- lib/tlspretense/test_harness/certificate_manager.rb
+- lib/tlspretense/test_harness/config.rb
+- lib/tlspretense/test_harness/input_handler.rb
+- lib/tlspretense/test_harness/runner.rb
+- lib/tlspretense/test_harness/runner_options.rb
+- lib/tlspretense/test_harness/ssl_test_case.rb
+- lib/tlspretense/test_harness/ssl_test_report.rb
+- lib/tlspretense/test_harness/ssl_test_result.rb
+- lib/tlspretense/test_harness/test_listener.rb
+- lib/tlspretense/test_harness/test_manager.rb
 - lib/tlspretense/version.rb
 - packetthief_examples/certs/cacert.pem
 - packetthief_examples/certs/cakey.pem
@@ -213,12 +213,12 @@ files:
 - spec/packetthief/logging_spec.rb
 - spec/packetthief_spec.rb
 - spec/spec_helper.rb
-- spec/ssl_test/certificate_manager_spec.rb
-- spec/ssl_test/config_spec.rb
-- spec/ssl_test/runner_spec.rb
-- spec/ssl_test/ssl_test_case_spec.rb
-- spec/ssl_test/test_listener_spec.rb
-- spec/ssl_test/test_manager_spec.rb
+- spec/tlspretense/test_harness/certificate_manager_spec.rb
+- spec/tlspretense/test_harness/config_spec.rb
+- spec/tlspretense/test_harness/runner_spec.rb
+- spec/tlspretense/test_harness/ssl_test_case_spec.rb
+- spec/tlspretense/test_harness/test_listener_spec.rb
+- spec/tlspretense/test_harness/test_manager_spec.rb
 - tlspretense.gemspec
 homepage: https://github.com/iSECPartners/tlspretense
 licenses:
@@ -254,9 +254,9 @@ test_files:
 - spec/packetthief/logging_spec.rb
 - spec/packetthief_spec.rb
 - spec/spec_helper.rb
-- spec/ssl_test/certificate_manager_spec.rb
-- spec/ssl_test/config_spec.rb
-- spec/ssl_test/runner_spec.rb
-- spec/ssl_test/ssl_test_case_spec.rb
-- spec/ssl_test/test_listener_spec.rb
-- spec/ssl_test/test_manager_spec.rb
+- spec/tlspretense/test_harness/certificate_manager_spec.rb
+- spec/tlspretense/test_harness/config_spec.rb
+- spec/tlspretense/test_harness/runner_spec.rb
+- spec/tlspretense/test_harness/ssl_test_case_spec.rb
+- spec/tlspretense/test_harness/test_listener_spec.rb
+- spec/tlspretense/test_harness/test_manager_spec.rb

data/lib/ssl_test.rb

@@ -1,21 +0,0 @@
-require 'packetthief'
-require 'eventmachine'
-require 'optparse'
-require 'termios'
-require 'logger'
-
-require 'ssl_test/ext_core/io_raw_input'
-
-module SSLTest
-  autoload :AppContext,         'ssl_test/app_context'
-  autoload :CertificateManager, 'ssl_test/certificate_manager'
-  autoload :Config,       'ssl_test/config'
-  autoload :InputHandler, 'ssl_test/input_handler'
-  autoload :RunnerOptions,      'ssl_test/runner_options'
-  autoload :Runner,       'ssl_test/runner'
-  autoload :SSLTestCase,  'ssl_test/ssl_test_case'
-  autoload :SSLTestReport,  'ssl_test/ssl_test_report'
-  autoload :SSLTestResult,  'ssl_test/ssl_test_result'
-  autoload :TestListener, 'ssl_test/test_listener'
-  autoload :TestManager, 'ssl_test/test_manager'
-end