forest_liana 2.13.0 → 2.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90cfcbc6a189d0f813ab9be3b691b651147080b1
-  data.tar.gz: 20a7fb7fe5095658f63cd4e83f926959f90d45c3
+  metadata.gz: 7d1941c0af3bb4db4a10bc53472238782ad89f55
+  data.tar.gz: 7d2ec8809e2f1ff8b53fa9feebca63cdf28c5fcc
 SHA512:
-  metadata.gz: 33199e1098b84e64b5a90fc289b4f4aa67e40d77296a55887d77f8cd15332eac37eac91ec27df47679d97978366047b6ae3a05ad394d74dce26251c00e53071e
-  data.tar.gz: 59668615c97545bd736bff03f24273fd08e37ee89c51d0b3af2ea331776579c5f2deda5686158f58de8652f7f0e320f284dc43eedc6828d9889b6b205f6eba39
+  metadata.gz: 462403bb7e3b0bf329badfec0205fac6ee2c318150cc4909c66a98a643bf744ffec2e8645b1b640918a54785f62b725597f4156113323f1329754564ce32d39e
+  data.tar.gz: bf01bd37a5744d4a55b11a0623b5de93d93797900786d5a99669612df3546eab7ec3932a01e62239fc3923919ca091d3bdaab1fd95d74b4a5a80605d72e81bf9

data/app/controllers/forest_liana/base_controller.rb

@@ -10,16 +10,16 @@ module ForestLiana
       begin
         ip = request.remote_ip
 
-        if !IpWhitelist.is_ip_whitelist_retrieved || !IpWhitelist.is_ip_valid(ip)
-          unless IpWhitelist.retrieve
-            raise Errors::HTTP403Error.new("IP whitelist not retrieved")
+        if !ForestLiana::IpWhitelist.is_ip_whitelist_retrieved || !ForestLiana::IpWhitelist.is_ip_valid(ip)
+          unless ForestLiana::IpWhitelist.retrieve
+            raise ForestLiana::Errors::HTTP403Error.new("IP whitelist not retrieved")
           end
 
-          unless IpWhitelist.is_ip_valid(ip)
-            raise Errors::HTTP403Error.new("IP address rejected (#{ip})")
+          unless ForestLiana::IpWhitelist.is_ip_valid(ip)
+            raise ForestLiana::Errors::HTTP403Error.new("IP address rejected (#{ip})")
           end
         end
-      rescue Errors::ExpectedError => exception
+      rescue ForestLiana::Errors::ExpectedError => exception
         exception.display_error
         error_data = JSONAPI::Serializer.serialize_errors([{
           status: exception.error_code,

data/app/controllers/forest_liana/sessions_controller.rb

@@ -50,17 +50,17 @@ module ForestLiana
     )
       begin
         if two_factor_registration && two_factor_token.nil?
-          raise Errors::HTTP401Error
+          raise ForestLiana::Errors::HTTP401Error
         end
 
         # NOTICE: The IP Whitelist is retrieved on any request if it was not retrieved yet, or when
         #         an IP is rejected, to ensure the IP is still rejected (meaning the configuration
         #         on the projects has not changed). To handle the last case, which is rejecting an
         #         IP which was not initaliy rejected, we need periodically refresh the whitelist.
-        #         This is done here on the login of any user. 
-        IpWhitelist.retrieve
+        #         This is done here on the login of any user.
+        ForestLiana::IpWhitelist.retrieve
 
-        reponse_data = LoginHandler.new(
+        reponse_data = ForestLiana::LoginHandler.new(
           rendering_id,
           auth_data,
           use_google_authentication,

data/app/services/forest_liana/authorization_getter.rb

@@ -24,7 +24,8 @@ module ForestLiana
           query_parameters['two-factor-registration'] = true
         end
 
-        response = ForestApiRequester.get(@route, query: query_parameters, headers: headers)
+        response = ForestLiana::ForestApiRequester
+          .get(@route, query: query_parameters, headers: headers)
 
         if response.is_a?(Net::HTTPOK)
           body = JSON.parse(response.body)
@@ -39,7 +40,7 @@ module ForestLiana
           end
         end
       rescue
-        raise Errors::HTTP401Error
+        raise ForestLiana::Errors::HTTP401Error
       end
     end
   end

data/app/services/forest_liana/ip_whitelist.rb

@@ -5,7 +5,7 @@ module ForestLiana
 
     def self.retrieve
       begin
-        response = ForestApiRequester.get('/liana/v1/ip-whitelist-rules')
+        response = ForestLiana::ForestApiRequester.get('/liana/v1/ip-whitelist-rules')
 
         if response.is_a?(Net::HTTPOK)
           body = JSON.parse(response.body)
@@ -20,7 +20,7 @@ module ForestLiana
       rescue => exception
         FOREST_LOGGER.error 'Cannot retrieve the IP Whitelist from the Forest server.'
         FOREST_LOGGER.error 'Which was caused by:'
-        Errors::ExceptionHelper.recursively_print(exception, margin: ' ', is_error: true)
+        ForestLiana::Errors::ExceptionHelper.recursively_print(exception, margin: ' ', is_error: true)
         false
       end
     end
@@ -31,7 +31,7 @@ module ForestLiana
 
     def self.is_ip_valid(ip)
       if @@use_ip_whitelist
-        return IpWhitelistChecker.is_ip_matches_any_rule(ip, @@ip_whitelist_rules)
+        return ForestLiana::IpWhitelistChecker.is_ip_matches_any_rule(ip, @@ip_whitelist_rules)
       end
 
       true

data/app/services/forest_liana/login_handler.rb

@@ -19,17 +19,23 @@ module ForestLiana
     end
 
     def perform
-      user = AuthorizationGetter.new(@rendering_id, @use_google_authentication, @auth_data, @two_factor_registration).perform
+      user = ForestLiana::AuthorizationGetter.new(
+        @rendering_id,
+        @use_google_authentication,
+        @auth_data,
+        @two_factor_registration
+      ).perform
 
       if user['two_factor_authentication_enabled']
         if !@two_factor_token.nil?
           if is_two_factor_token_valid(user, @two_factor_token)
-            TwoFactorRegistrationConfirmer.new(@project_id, @use_google_authentication, @auth_data)
+            ForestLiana::TwoFactorRegistrationConfirmer
+              .new(@project_id, @use_google_authentication, @auth_data)
               .perform
 
             return { 'token' => create_token(user, @rendering_id) }
           else
-            raise Errors::HTTP401Error.new('Your token is invalid, please try again.')
+            raise ForestLiana::Errors::HTTP401Error.new('Your token is invalid, please try again.')
           end
         else
           return get_two_factor_response(user)
@@ -53,7 +59,7 @@ module ForestLiana
         FOREST_LOGGER.error 'The FOREST_2FA_SECRET_SALT environment variable must be 20 characters long.'
         FOREST_LOGGER.error 'You can generate it using this command: `$ openssl rand -hex 10`'
 
-        raise Errors::HTTP401Error.new('Invalid 2FA configuration, please ask more information to your admin')
+        raise ForestLiana::Errors::HTTP401Error.new('Invalid 2FA configuration, please ask more information to your admin')
       end
     end
 
@@ -63,7 +69,7 @@ module ForestLiana
       return { 'twoFactorAuthenticationEnabled' => true } if user['two_factor_authentication_active']
 
       two_factor_authentication_secret = user['two_factor_authentication_secret']
-      user_secret = UserSecretCreator
+      user_secret = ForestLiana::UserSecretCreator
         .new(two_factor_authentication_secret, ENV['FOREST_2FA_SECRET_SALT'])
         .perform
 
@@ -78,7 +84,7 @@ module ForestLiana
 
       two_factor_authentication_secret = user['two_factor_authentication_secret']
 
-      user_secret = UserSecretCreator
+      user_secret = ForestLiana::UserSecretCreator
         .new(two_factor_authentication_secret, ENV['FOREST_2FA_SECRET_SALT'])
         .perform
 

data/app/services/forest_liana/permissions_getter.rb

@@ -8,17 +8,17 @@ module ForestLiana
     def perform
       begin
         query_parameters = { 'renderingId' => @rendering_id }
-        response = ForestApiRequester.get(@route, query: query_parameters)
+        response = ForestLiana::ForestApiRequester.get(@route, query: query_parameters)
 
         if response.is_a?(Net::HTTPOK)
           JSON.parse(response.body)
         else
-          raise "Forest API returned an #{Errors::HTTPErrorHelper.format(response)}"
+          raise "Forest API returned an #{ForestLiana::Errors::HTTPErrorHelper.format(response)}"
         end
       rescue => exception
         FOREST_LOGGER.error 'Cannot retrieve the permissions from the Forest server.'
         FOREST_LOGGER.error 'Which was caused by:'
-        Errors::ExceptionHelper.recursively_print(exception, margin: ' ', is_error: true)
+        ForestLiana::Errors::ExceptionHelper.recursively_print(exception, margin: ' ', is_error: true)
         nil
       end
     end

data/app/services/forest_liana/two_factor_registration_confirmer.rb

@@ -20,16 +20,16 @@ module ForestLiana
           body_data['email'] = @auth_data[:email]
         end
 
-        response = ForestApiRequester.post(
+        response = ForestLiana::ForestApiRequester.post(
           "/liana/v2/projects/#{@project_id}/two-factor-registration-confirm",
           body: body_data,
         )
 
         unless response.is_a?(Net::HTTPOK)
-          raise "Cannot retrieve the data from the Forest server. Forest API returned an #{Errors::HTTPErrorHelper.format(response)}"
+          raise "Cannot retrieve the data from the Forest server. Forest API returned an #{ForestLiana::Errors::HTTPErrorHelper.format(response)}"
         end
       rescue
-        raise Errors::HTTP401Error
+        raise ForestLiana::Errors::HTTP401Error
       end
     end
   end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "2.13.0"
+  VERSION = "2.13.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.13.1
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-13 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails