hubssolib 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9309369683fa647e559c4a87d5569e215d25f472b2acdb6869b538807a42ecf2
-  data.tar.gz: 6b4ffb49a16835ceac8436c6ebd5d9270fe9ea1af2d9c1de07616e2b38f5cd5e
+  metadata.gz: 5fafbf54747841c2d90eaa755481e8c1eecf9e060d64e62d7ff6a446acf2bbc4
+  data.tar.gz: 2243d8561879026aedc904f6505e3a38e2193db7ed5d94540bc520976e15ef23
 SHA512:
-  metadata.gz: 8b4d75adcceea21ca4b95b49410a20667b7a1088e7f0bcf63e267699a779ba8e1ececcf2a5d5894274f7f12fe47eb4694bc948df912d625c86aece3dfc6551a7
-  data.tar.gz: 7c6aea5a1261203b6c74872620cbb7195e53cb9b545df6dea252bb0c4dce7c25260891d0ee7ceca8b1a85da29fb8669a7fb8346202f972d3263e199efd1df26c
+  metadata.gz: a3653217e5809704a69b20fcae5f94a3066ed26085fdced81c36c8f8bf99b9299212ddf51fde2af411790dd51ebcbd004fe4993c61c0a6588e39f8b080a6abce
+  data.tar.gz: 437fa627ad45ae7baa8e9772a3c1157db324d7b62d889fb53eb81b395317b985b02a5d04ee1f4e7cd1111de3ca24ed16376913ad0b5328b4e630ff241167d793

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## Version 1 -> Version 2.0.0, 19-Apr-2020
+## 2.1.0, 01-Jul-2022
+
+* Use `HUB_QUIET_SERVER=yes ...` to quieten `$stdout` output from Hub server.
+* Test coverage fixed (overlooked in v2.0.0 release).
+* Maintenance `bundle update`.
+* A few minor tidy-ups in the implementation.
+
+## Version 1.0.0 -> Version 2.0.0, 19-Apr-2020
 
 The public interface to applications is generally unchanged, but the cookie storage mechanism has been improved and is not compatible with v1 of Hub. You will need to use the newer Hub application, server and gem, but hopefully will find you don't need to change anything with your integrated applications.
 

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec # See hubssolib.gemspec

data/Gemfile.lock

@@ -1,13 +1,16 @@
 PATH
   remote: .
   specs:
-    hubssolib (2.0.0)
+    hubssolib (2.1.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
+    byebug (11.1.3)
     diff-lcs (1.5.0)
     docile (1.4.0)
+    doggo (1.2.0)
+      rspec-core (~> 3.10)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -32,6 +35,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  byebug (~> 11.1)
+  doggo (~> 1.2)
   hubssolib!
   rspec (~> 3.8)
   rspec-mocks (~> 3.8)

data/hubssolib.gemspec

@@ -4,11 +4,10 @@ spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.name     = 'hubssolib'
 
-  s.version  = '2.0.0'
+  s.version  = '2.1.0'
   s.author   = 'Andrew Hodgkinson and others'
   s.email    = 'ahodgkin@rowing.org.uk'
   s.homepage = 'http://hub.pond.org.uk/'
-  s.date     = File.ctime('VERSION')
   s.summary  = 'Cross-application single sign-on support library.'
   s.license  = 'MIT'
 
@@ -25,7 +24,9 @@ spec = Gem::Specification.new do |s|
   s.files = FileList['lib/**/*.rb', '[A-Z]*'].to_a
   s.required_ruby_version = '>= 2.5.9' # Not tested on earlier versions
 
-  s.add_development_dependency 'simplecov',   '~> 0.16'
-  s.add_development_dependency 'rspec',       '~> 3.8'
-  s.add_development_dependency 'rspec-mocks', '~> 3.8'
+  s.add_development_dependency 'byebug',      '~> 11.1'
+  s.add_development_dependency 'simplecov',   '~>  0.16'
+  s.add_development_dependency 'doggo',       '~>  1.2'
+  s.add_development_dependency 'rspec',       '~>  3.8'
+  s.add_development_dependency 'rspec-mocks', '~>  3.8'
 end

data/lib/hub_sso_lib.rb

@@ -75,7 +75,7 @@ module HubSsoLib
     def self.deserialise_object(data)
       Marshal.load(Base64.strict_decode64(data)) rescue nil
     end
-  end # Crypto class
+  end # Serialiser class
 
   #######################################################################
   # Class:   Roles                                                      #
@@ -409,9 +409,10 @@ module HubSsoLib
 
   class SessionFactory
     def initialize
-      puts "Session factory: Awaken"
-
+      @hub_be_quiet = ! ENV['HUB_QUIET_SERVER'].nil?
       @hub_sessions = {}
+
+      puts "Session factory: Awaken" unless @hub_be_quiet
     end
 
     # Get a session using a given key (a UUID). Generates a new session if
@@ -434,23 +435,25 @@ module HubSsoLib
     #               invalid and discarded.
     #
     def get_hub_session_proxy(key, remote_ip)
-      retrieve_existing = @hub_sessions.has_key?(key)
-      message           = retrieve_existing ? 'Retrieving' : 'Created'
-      new_key           = SecureRandom.uuid
+      hub_session = @hub_sessions[key]
+      message     = hub_session.nil? ? 'Created' : 'Retrieving'
+      new_key     = SecureRandom.uuid
 
-      puts "#{message} session for key #{key} and rotating to #{new_key}"
+      unless @hub_be_quiet
+        puts "#{ message } session for key #{ key } and rotating to #{ new_key }"
+      end
 
-      if retrieve_existing
-        hub_session = @hub_sessions[key]
-        if remote_ip != hub_session.session_ip
-          puts "WARNING: IP address changed from #{hub_session.session_ip} to #{remote_ip} -> discarding session"
-          hub_session = @hub_sessions[key] = HubSsoLib::Session.new
+      unless hub_session.nil? || hub_session.session_ip == remote_ip
+        unless @hub_be_quiet
+          puts "WARNING: IP address changed from #{ hub_session.session_ip } to #{ remote_ip } -> discarding session"
         end
 
-      else
-        hub_session            = @hub_sessions[key] = HubSsoLib::Session.new
-        hub_session.session_ip = remote_ip
+        hub_session = nil
+      end
 
+      if hub_session.nil?
+        hub_session            = HubSsoLib::Session.new
+        hub_session.session_ip = remote_ip
       end
 
       @hub_sessions.delete(key)
@@ -483,7 +486,7 @@ module HubSsoLib
 
   module Server
     def hubssolib_launch_server
-      puts "Server: Starting at #{ HUB_CONNECTION_URI }"
+      puts "Server: Starting at #{ HUB_CONNECTION_URI }" unless ENV['HUB_QUIET_SERVER'].nil?
 
       @@hub_session_factory = HubSsoLib::SessionFactory.new
       DRb.start_service(HUB_CONNECTION_URI, @@hub_session_factory, { :safe_level => 1 })
@@ -819,7 +822,7 @@ module HubSsoLib
       keys = ordered_keys | hash.keys
 
       keys.each do | key |
-        compiled_data[ 'hub' ][ key ] = hash[ key ] if hash.has_key?( key )
+        compiled_data['hub'][key] = hash[key] if hash.key?(key)
       end
 
       if defined?( flash )
@@ -827,7 +830,7 @@ module HubSsoLib
         keys = ordered_keys | hash.keys
 
         keys.each do | key |
-          compiled_data[ 'standard' ][ key ] = hash[ key ] if hash.has_key?( key )
+          compiled_data['standard'][key] = hash[key] if hash.key?(key)
         end
       end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hubssolib
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Andrew Hodgkinson and others
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
+- !ruby/object:Gem::Dependency
+  name: doggo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -69,7 +97,6 @@ files:
 - Gemfile
 - Gemfile.lock
 - README.md
-- VERSION
 - hubssolib.gemspec
 - lib/hub_sso_lib.rb
 homepage: http://hub.pond.org.uk/

data/VERSION

@@ -1 +0,0 @@
-2.0.0 (19-Apr-2020)