Merge pull request #34 from securenative/dev

Dev

Author: inbaltako

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
           gem install bundler
           bundler install
       - name: Run tests
-        run: bundle exec rspec spec --pattern **/spec_*.rb
+        run: bundle exec rspec spec --pattern **/**/spec_*.rb
 
       - name: Notify slack success
         if: success()

.github/workflows/test.yml

@@ -23,7 +23,7 @@ jobs:
           gem install bundler
           bundler install
       - name: Run tests
-        run: bundle exec rspec spec --pattern **/spec_*.rb
+        run: bundle exec rspec spec --pattern **/**/spec_*.rb
 
       - name: Notify slack success
         if: success()

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    securenative (0.1.39)
+    securenative (0.1.40)
 
 GEM
   remote: https://rubygems.org/

lib/securenative/context.rb

@@ -54,7 +54,7 @@ def self.from_http_request(request, options)
       end
 
       if SecureNative::Utils::Utils.null_or_empty?(client_token)
-        client_token = SecureNative::Utils::RequestUtils.get_secure_header_from_request(request.headers)
+          client_token = SecureNative::Utils::RequestUtils.get_secure_header_from_request(headers)
       end
 
       SecureNative::Context.new(client_token: client_token, ip: SecureNative::Utils::RequestUtils.get_client_ip_from_request(request, options),

lib/securenative/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SecureNative
-  VERSION = '0.1.39'
+  VERSION = '0.1.40'
 end

spec/securenative/spec_api_manager.rb

@@ -55,7 +55,7 @@
         'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
         'Authorization' => 'YOUR_API_KEY',
         'Content-Type' => 'application/json',
-        'Sn-Version' => '0.1.39',
+        'Sn-Version' => '0.1.40',
         'User-Agent' => 'SecureNative-ruby'
       }
     ).to_return(status: 200, body: '', headers: {})
@@ -72,6 +72,6 @@
     expect(result).not_to be_nil
     expect(result.risk_level).to eq('low')
     expect(result.score).to eq(0)
-    expect(result.triggers).to eq(nil)
+    expect(result.triggers).to eq([])
   end
 end

spec/securenative/spec_context_builder.rb

@@ -7,14 +7,16 @@
 require 'sinatra'
 require 'rspec'
 
+securenative = SecureNative::Client.init_with_api_key('YOUR_API_KEY')
+
 RSpec.describe SecureNative::Context do
   it 'creates context from ruby default request' do
     stub_request(:any, 'www.example.com')
       .to_return(status: 200,
                  headers: { '_sn': '71532c1fad2c7f56118f7969e401f3cf080239140d208e7934e6a530818c37e544a0c2330a487bcc6fe4f662a57f265a3ed9f37871e80529128a5e4f2ca02db0fb975ded401398f698f19bb0cafd68a239c6caff99f6f105286ab695eaf3477365bdef524f5d70d9be1d1d474506b433aed05d7ed9a435eeca357de57817b37c638b6bb417ffb101eaf856987615a77a' })
 
     request = Net::HTTP.get_response('www.example.com', '/')
-    context = SecureNative::Context.from_http_request(request)
+    context = securenative.from_http_request(request)
 
     expect(context.ip).to eq('')
     expect(context.http_method).to eq('')
@@ -26,37 +28,37 @@
 
   it 'creates context from rails request' do
     request = ActionDispatch::Request.new(nil)
-    context = SecureNative::Context.from_http_request(request)
+    context = securenative.from_http_request(request)
 
     expect(context.ip).to eq('')
     expect(context.http_method).to eq('')
     expect(context.url).to eq('')
     expect(context.remote_ip).to eq('')
-    expect(context.headers).to eq([])
+    expect(context.headers).to eq({})
     expect(context.body).to eq('')
   end
 
   it 'creates context from sinatra request' do
     request = Sinatra::Request.new(nil)
-    context = SecureNative::Context.from_http_request(request)
+    context = securenative.from_http_request(request)
 
     expect(context.ip).to eq('')
     expect(context.http_method).to eq('')
     expect(context.url).to eq('')
     expect(context.remote_ip).to eq('')
-    expect(context.headers).to eq([])
+    expect(context.headers).to eq({})
     expect(context.body).to eq('')
   end
 
   it 'creates context from hanami request' do
     request = Hanami::Action::Request
-    context = SecureNative::Context.from_http_request(request)
+    context = securenative.from_http_request(request)
 
     expect(context.ip).to eq('')
     expect(context.http_method).to eq('')
     expect(context.url).to eq('')
     expect(context.remote_ip).to eq('')
-    expect(context.headers).to eq([])
+    expect(context.headers).to eq({})
     expect(context.body).to eq('')
   end
 

spec/securenative/spec_event_manager.rb

@@ -29,7 +29,7 @@ def initialize
               'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
               'Authorization' => 'YOUR_API_KEY',
               'Content-Type' => 'application/json',
-              'Sn-Version' => '0.1.39',
+              'Sn-Version' => '0.1.40',
               'User-Agent' => 'SecureNative-ruby'
             })
       .to_return(status: 200, body: '', headers: {})
@@ -53,7 +53,7 @@ def initialize
               'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
               'Authorization' => 'YOUR_API_KEY',
               'Content-Type' => 'application/json',
-              'Sn-Version' => '0.1.39',
+              'Sn-Version' => '0.1.40',
               'User-Agent' => 'SecureNative-ruby'
             })
       .to_return(status: 401, body: '', headers: {})
@@ -74,7 +74,7 @@ def initialize
               'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
               'Authorization' => 'YOUR_API_KEY',
               'Content-Type' => 'application/json',
-              'Sn-Version' => '0.1.39',
+              'Sn-Version' => '0.1.40',
               'User-Agent' => 'SecureNative-ruby'
             })
       .to_return(status: 500, body: '', headers: {})

spec/securenative/spec_http_client.rb

@@ -15,7 +15,7 @@
               'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
               'Authorization' => 'YOUR_API_KEY',
               'Content-Type' => 'application/json',
-              'Sn-Version' => '0.1.39',
+              'Sn-Version' => '0.1.40',
               'User-Agent' => 'SecureNative-ruby'
             }).to_return(status: 200, body: '', headers: {})
 

spec/securenative/spec_sdk.rb

@@ -5,6 +5,7 @@
 
 RSpec.describe SecureNative::Client do
   it 'gets sdk instance without init throws' do
+    SecureNative::Client._flush
     expect { SecureNative::Client.instance }.to raise_error(SecureNativeSDKIllegalStateError)
   end