etna 0.1.35 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf1f86e15c74113a4591afd3d8a43064b6ed3b448bdfad3739baa27061df7913
-  data.tar.gz: ed543c8775c89679b4755ca3119899639fc125df2d7e65c3515998f06ae45de8
+  metadata.gz: a6d9abd6b64884e701b1055215018b85939ee0bf6cc19275eccae0ebffe92856
+  data.tar.gz: a382140c854224855b317923551d467baa3b29202ec6ebccc2fb8d7782115d06
 SHA512:
-  metadata.gz: 8523211434696c74c03ca5319a089c74dba9bc3c3cc086f723dcadd1789c91f2e6c7fe43701cd3ac467460bc5a8ee1f4c82c032a5d0ac16e666a565212fba209
-  data.tar.gz: 60e3338c3021ea2e1a54dcfb7f2a15c9ffce71aed5a12db7739992649cfd9518f19edc49262a0095ba09c8783e0ef499bcb3015aebca0d2b7751e7096cbf88eb
+  metadata.gz: e150a0e7dac99e3c637151033d4105617910188f9c61c8e2812b2fa75c3d3967e95bb2fa43babb98802b14640658e02167c81b825fa0e1be41cef6340a74d4fa
+  data.tar.gz: 6f7365324ceed077161b4507397380837cc0d355f6cbd4dfff22b2abb527eaeafc2455e3cb3138d7b9a8085d3b4a2b3cf05b86417f2458a9bc80da859c77ed24

data/lib/etna/application.rb

@@ -31,6 +31,12 @@ module Etna::Application
     raise "Could not find application instance from #{namespace}, and not subclass of Application found."
   end
 
+  # Used to find the application in development recorded vcr tests.
+  # see spec/vcr.rb
+  def dev_route
+    "#{self.class.name.split('::').first.downcase}.development.local"
+  end
+
   def self.register(app)
     @instance = app
   end

data/lib/etna/auth.rb

@@ -86,7 +86,7 @@ module Etna
         host: application.config(:janus)[:host]
       )
 
-      response = janus_client.validate_task_token()
+      response = janus_client.validate_task_token
 
       return false unless response.code == '200'
 

data/lib/etna/client.rb

@@ -173,7 +173,7 @@ module Etna
         verify_mode = @ignore_ssl ?
           OpenSSL::SSL::VERIFY_NONE :
           OpenSSL::SSL::VERIFY_PEER
-        Net::HTTP.start(uri.host, uri.port, use_ssl: true, verify_mode: verify_mode) do |http|
+        Net::HTTP.start(uri.host, uri.port, use_ssl: true, verify_mode: verify_mode, read_timeout: 300) do |http|
           http.request(data) do |response|
             status_check!(response)
             yield response
@@ -183,7 +183,7 @@ module Etna
         verify_mode = @ignore_ssl ?
           OpenSSL::SSL::VERIFY_NONE :
           OpenSSL::SSL::VERIFY_PEER
-        Net::HTTP.start(uri.host, uri.port, use_ssl: true, verify_mode: verify_mode) do |http|
+        Net::HTTP.start(uri.host, uri.port, use_ssl: true, verify_mode: verify_mode, read_timeout: 300) do |http|
           response = http.request(data)
           status_check!(response)
           return response

data/lib/etna/clients/base_client.rb

@@ -29,7 +29,8 @@ module Etna
       def token_will_expire?(offset=3000)
         # offset in seconds
         # Will the user's token expire in the given amount of time?
-        epoch_seconds = JSON.parse(Base64.urlsafe_decode64(token.split('.')[1]))["exp"]
+        payload = JSON.parse(Base64.urlsafe_decode64(token.split('.')[1]))
+        epoch_seconds = payload["exp"]
         expiration = DateTime.strptime(epoch_seconds.to_s, "%s")
         expiration <= DateTime.now.new_offset + offset
       end

data/lib/etna/clients/janus/client.rb

@@ -58,20 +58,19 @@ module Etna
         TokenResponse.new(token)
       end
 
-      def validate_task_token(validate_task_token_request = ValidateTaskTokenRequest.new)
-        token = nil
-        @etna_client.post('/api/tokens/task/validate', validate_task_token_request)
+      def validate_task_token
+        @etna_client.post('/api/tokens/validate_task')
       end
 
       def get_nonce
         @etna_client.get('/api/tokens/nonce').body
       end
 
-      def generate_token(token_type, signed_nonce: nil, project_name: nil)
+      def generate_token(token_type, signed_nonce: nil, project_name: nil, read_only: false)
         response = @etna_client.with_headers(
           'Authorization' => signed_nonce ? "Signed-Nonce #{signed_nonce}" : nil
         ) do
-          post('/api/tokens/generate', token_type: token_type, project_name: project_name)
+          post('/api/tokens/generate', token_type: token_type, project_name: project_name, read_only: read_only)
         end
 
         response.body

data/lib/etna/spec/vcr.rb

@@ -4,13 +4,32 @@ require 'openssl'
 require 'digest/sha2'
 require 'base64'
 
-def setup_base_vcr(spec_helper_dir)
+def setup_base_vcr(spec_helper_dir, server: nil, application: nil)
   VCR.configure do |c|
     c.hook_into :webmock
     c.cassette_serializers
     c.cassette_library_dir = ::File.join(spec_helper_dir, 'fixtures', 'cassettes')
     c.allow_http_connections_when_no_cassette = true
 
+    c.register_request_matcher :verify_uri_route do |request_1, request_2|
+      next true if server.nil? || application.nil?
+
+      route_match = request_1.uri =~ /https:\/\/#{application.dev_route}(.*)/
+      if route_match && route_match[1]
+        def request_1.request_method
+          method.to_s.upcase
+        end
+
+        def request_1.path
+          URI(uri).path
+        end
+
+        !!server.find_route(request_1)
+      else
+        true
+      end
+    end
+
     c.register_request_matcher :try_body do |request_1, request_2|
       if request_1.headers['Content-Type'].first =~ /application\/json/
         if request_2.headers['Content-Type'].first =~ /application\/json/
@@ -39,7 +58,7 @@ def setup_base_vcr(spec_helper_dir)
         else
           ENV['RERECORD'] ? :all : :once
         end,
-        match_requests_on: [:method, :uri, :try_body]
+        match_requests_on: [:method, :uri, :try_body, :verify_uri_route]
     }
 
     # Filter the authorization headers of any request by replacing any occurrence of that request's

data/lib/etna/test_auth.rb

@@ -42,7 +42,6 @@ module Etna
       # We do this to support Metis client tests, we pass in tokens with multiple "."-separated parts, so
       #   have to account for that.
       payload = JSON.parse(Base64.decode64(token.split('.')[1]))
-
       request.env['etna.user'] = Etna::User.new(payload.map{|k,v| [k.to_sym, v]}.to_h, token)
     end
 

data/lib/etna/user.rb

@@ -7,7 +7,7 @@ module Etna
     }
 
     def initialize params, token=nil
-      @name, @email, @encoded_permissions, encoded_flags = params.values_at(:name, :email, :perm, :flags)
+      @name, @email, @encoded_permissions, encoded_flags, @task = params.values_at(:name, :email, :perm, :flags, :task)
 
       @flags = encoded_flags&.split(/;/) || []
       @token = token unless !token
@@ -16,6 +16,10 @@ module Etna
 
     attr_reader :name, :email, :token
 
+    def task?
+      !!@task
+    end
+
     def permissions
       @permissions ||= @encoded_permissions.split(/\;/).map do |roles|
         role, projects = roles.split(/:/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etna
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.36
 platform: ruby
 authors:
 - Saurabh Asthana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack