riddl 0.99.257 → 0.99.258

data/lib/ruby/riddl/client.rb

@@ -257,6 +257,10 @@ unless Module.constants.include?('CLIENT_INCLUDED')
 
         def exec_request(riddl_method,parameters,simulate) #{{{
           parameters = [ parameters ] unless parameters.is_a? Array
+          (URI.parse(@base)&.query || '').split(/[#{D}] */n).each do |p|
+            k, v = Riddl::Protocols::Utils::unescape(p).split('=', 2)
+            parameters << Parameter::Simple.new(k,v,:query)
+          end
           parameters = parameters.dup
           headers = extract_headers(parameters)
           options = extract_options(parameters)

data/lib/ruby/riddl/utils/oauth2-univie.rb

@@ -50,11 +50,6 @@ module Riddl
               end
 
               @headers << Riddl::Header.new('AUTHORIZATION_BEARER', access_tokens.get(token))
-            else
-              @status = 403
-              return Riddl::Parameter::Complex.new('data', 'application/json', {
-                :error => 'No authorization provided.'
-              }.to_json)
             end
 
             @p

data/lib/ruby/riddl/wrapper/description/message_and_transformation.rb

@@ -10,10 +10,13 @@ module Riddl
           if layer.nil?
             @content = content
           else
+            puts layer.dump
+            puts "des:#{type}[@name='#{name}']"
+
             @content = layer.find("des:#{type}[@name='#{name}']").first.to_doc
             @content.root.find("@name").delete_all!
             @content.register_namespace 'des', Riddl::Wrapper::DESCRIPTION
-          end  
+          end
           update_hash!
         end
         def update_hash!
@@ -32,8 +35,8 @@ module Riddl
           @hash      = hb.serialize.hash
         end
         def traverse?(other)
-          if other.name.nil? 
-            false 
+          if other.name.nil?
+            false
           else
             paths = self.hash_base.find("//des:parameter").map{ |e| e.path + "/@name" }
             hb2 = XML::Smart::string(other.hash_base.serialize)
@@ -45,7 +48,7 @@ module Riddl
             end
 
             self.hash_base.serialize.hash == hb2.serialize.hash
-          end 
+          end
         end
         attr_reader :name, :content, :hash, :hash_base
         #}}}
@@ -68,7 +71,7 @@ module Riddl
           super layer,name,:message
         end
         def initialize_copy(o)
-          @content = @content.dup 
+          @content = @content.dup
         end
         def transform(trans)
           ret = self.dup
@@ -82,18 +85,18 @@ module Riddl
                 when 'add_after'
                   raise "TODO"
                 when 'add_as_first'
-                  t = ret.content.root 
+                  t = ret.content.root
                   n = t.find("header[last()]").first
                   if n.nil?
                     m = t.find("*[not(header)]").first
                     if m.nil?
                       t.add(e.children)
-                    else  
+                    else
                       m.add_before(e.children)
                     end
-                  else  
+                  else
                     n.add_after(e.children)
-                  end  
+                  end
                 when 'add_as_last'
                   ret.content.root.add(e.children)
                   ret.update_hash!
@@ -108,14 +111,14 @@ module Riddl
                         opt.add(node)
                       when 'header'
                         ret.content.find("header[@name=\"#{e.attributes['name']}\"]").delete_all!
-                    end    
+                    end
                   else
                     case e.attributes['type']
                       when 'parameter', nil
                         ret.content.find("//parameter[first()]").delete_all!
                       when 'header'
                         ret.content.find("//header[first()]").delete_all!
-                    end    
+                    end
                   end
                 when 'remove_last'
                   if e.attributes['name']
@@ -126,18 +129,18 @@ module Riddl
                         opt.add(node)
                       when 'header'
                         ret.content.find("header[@name=\"#{e.attributes['name']}\"]").delete_all!
-                    end    
+                    end
                   else
                     case e.attributes['type']
                       when 'parameter', nil
                         ret.content.find("//parameter[last()]").delete_all!
                       when 'header'
                         ret.content.find("//header[last()]").delete_all!
-                    end    
+                    end
                   end
-              end  
-            end  
-          end  
+              end
+            end
+          end
           return ret
         end
         #}}}

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.99.257"
+  s.version          = "0.99.258"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.257
+  version: 0.99.258
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-smart
@@ -347,6 +347,7 @@ files:
 - examples/library/rngs/list-of-loans.rng
 - examples/library/server.rb
 - examples/library/static/info.txt
+- examples/library/test
 - examples/notifications/implementation/index.html
 - examples/notifications/implementation/juergen.html
 - examples/notifications/implementation/oliver.html
@@ -442,8 +443,6 @@ files:
 - lib/ruby/riddl/utils/notifications_producer.rb
 - lib/ruby/riddl/utils/oauth2-helper.rb
 - lib/ruby/riddl/utils/oauth2-univie.rb
-- lib/ruby/riddl/utils/oauth2-univie.rb.orig
-- lib/ruby/riddl/utils/oauth2-univie.rb.rej
 - lib/ruby/riddl/utils/properties.rb
 - lib/ruby/riddl/utils/turtle.rb
 - lib/ruby/riddl/utils/xmlserve.rb
@@ -514,18 +513,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: 'restful interface description and declaration language: tools and client/server
   libs'
 test_files:
-- test/tc_websocket.rb
-- test/tc_producer.rb
-- test/tc_helloworld.rb
-- test/tc_declaration-local.rb
 - test/tc_properties.rb
-- test/tc_library.rb
 - test/tc_declaration-hybrid.rb
+- test/tc_declaration-local.rb
+- test/tc_helloworld.rb
+- test/tc_library.rb
 - test/tc_declaration-distributed.rb
+- test/tc_websocket.rb
+- test/tc_producer.rb
 - test/smartrunner.rb

data/lib/ruby/riddl/utils/oauth2-univie.rb.orig

@@ -1,166 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/oauth2-helper')
-
-module Riddl
-  module Utils
-    module OAuth2
-
-      module UnivieBearer
-        class CheckAuth < Riddl::Implementation
-          def response
-            client_id = @a[0]
-            client_secret = @a[1]
-            access_tokens = @a[2]
-            if @h['AUTHORIZATION']
-              token = @h['AUTHORIZATION'].sub(/^Bearer /, '')
-
-              data, _, signature = token.rpartition '.'
-              expected_sign = Riddl::Utils::OAuth2::Helper::sign(client_id + ':' + client_secret, data)
-
-              if !access_tokens.key? token
-                @status = 403
-                return Riddl::Parameter::Complex.new('data', 'application/json', {
-                  :error => 'Unknown token'
-                }.to_json)
-              elsif signature != expected_sign
-                @status = 403
-                return Riddl::Parameter::Complex.new('data', 'application/json', {
-                  :error => 'Invalid token, you bad boy'
-                }.to_json)
-              end
-
-              header_claims, payload_claims = data.split('.').map { |v| Base64::urlsafe_decode64 v }
-              payload_claims = JSON::parse payload_claims
-
-              if header_claims != Riddl::Utils::OAuth2::Helper::header
-                @status = 401
-                return Riddl::Parameter::Complex.new('data', 'application/json', {
-                  :error => 'Invalid header claims'
-                }.to_json)
-              elsif payload_claims['exp'] <= Time.now.to_i
-                @status = 403
-                return Riddl::Parameter::Complex.new('data', 'application/json', {
-                  :error => 'Expired token'
-                }.to_json)
-              elsif !payload_claims['aud'].split(',').map(&:strip).include? client_id
-                # XXX: ein token für mehrere clients gültig? lookup?
-                @status = 403
-                return Riddl::Parameter::Complex.new('data', 'application/json', {
-                  :error => 'Token is not valid for this application'
-                }.to_json)
-              end
-
-              @headers << Riddl::Header.new('AUTHORIZATION_BEARER', access_tokens.get(token))
-            end
-
-            @p
-          end
-        end
-      end
-
-      module UnivieApp
-        def self::implementation(client_id, client_secret, access_tokens, refresh_tokens, codes, adur, rdur)
-          Proc.new do
-            run UnivieBearer::CheckAuth, client_id, client_secret, access_tokens if get 'check'
-            on resource 'verify' do
-              run VerifyIdentity, access_tokens, refresh_tokens, codes, client_id, client_secret, adur, rdur if post 'verify_in'
-            end
-            on resource 'token' do
-              run RefreshToken, access_tokens, refresh_tokens, client_id, client_secret, adur, rdur if post 'refresh_token_in'
-            end
-            on resource 'revoke' do
-              run RevokeFlow, access_tokens, refresh_tokens, codes if delete 'revoke_in'
-            end
-          end
-        end
-
-        class VerifyIdentity < Riddl::Implementation
-          def response
-            code = Base64::urlsafe_decode64 @p[0].value
-            access_tokens  = @a[0]
-            refresh_tokens = @a[1]
-            codes          = @a[2]
-            client_id      = @a[3]
-            client_secret  = @a[4]
-            adur           = @a[5]
-            rdur           = @a[6]
-            client_pass    = "#{client_id}:#{client_secret}"
-
-            user_id, decrypted = Riddl::Utils::OAuth2::Helper::decrypt_with_shared_secret(code, client_pass).split(':', 2) rescue [nil,nil]
-            if user_id.nil?
-              @status = 403
-              return Riddl::Parameter::Complex.new('data', 'application/json', {
-                :error => 'Code invalid. Client_id or client_secret not suitable for decryption.'
-              }.to_json)
-            else
-              token, refresh_token = Riddl::Utils::OAuth2::Helper::generate_optimistic_token(client_id, client_pass, adur, rdur)
-              codes.set(code, refresh_token, rdur)
-              access_tokens.set(token, user_id, rdur) # not adur, to identify expired access tokens
-              refresh_tokens.set(refresh_token, token, rdur)
-
-              json_response = {
-                :access_token => token,
-                :refresh_token => refresh_token,
-                :code => Base64.urlsafe_encode64(decrypted),
-                :user_id => user_id
-              }.to_json
-
-              Riddl::Parameter::Complex.new('data', 'application/json', json_response)
-            end
-          end
-        end
-
-        class RevokeFlow < Riddl::Implementation
-          def response
-            code           = Base64::urlsafe_decode64 @p[0].value
-            access_tokens  = @a[0]
-            refresh_tokens = @a[1]
-            codes          = @a[2]
-
-            rt = codes.delete(code)
-            at = refresh_tokens.delete(rt)
-            access_tokens.delete(at)
-          end
-        end
-
-        class RefreshToken < Riddl::Implementation
-          def response
-            refresh_token  = @p[1].value
-            access_tokens  = @a[0]
-            refresh_tokens = @a[1]
-            client_id      = @a[2]
-            client_secret  = @a[3]
-            adur           = @a[4]
-            rdur           = @a[5]
-
-            token, _ = refresh_token.split '.'
-            token_data = JSON::parse(Base64::urlsafe_decode64 token)
-
-            if token_data['iss'] != client_id
-              @status = 401
-              return Riddl::Parameter::Complex.new('data', 'application/json', {
-                :error => 'Token must be refreshed by issuer.'
-              }.to_json)
-            elsif !refresh_tokens.key?(refresh_token) || token_data['exp'] <= Time.now.to_i
-              @status = 403
-              puts "i dont know #{refresh_token}", "#{refresh_tokens.get(refresh_token)}"
-              return Riddl::Parameter::Complex.new('data', 'application/json', {
-                :error => 'Invalid refresh token.'
-              }.to_json)
-            end
-
-            old_token = refresh_tokens.get(refresh_token)
-            user = access_tokens.delete old_token
-
-            token = Riddl::Utils::OAuth2::Helper::generate_access_token(client_id, client_id + ':' + client_secret, adur)
-
-            access_tokens.set(token,user,rdur) # not adur, to identify expired access tokens
-            refresh_tokens.set(refresh_token, token)
-
-            Riddl::Parameter::Complex.new('data', 'application/json', { :token => token }.to_json)
-          end
-        end
-      end
-
-    end
-  end
-end

data/lib/ruby/riddl/utils/oauth2-univie.rb.rej

@@ -1,10 +0,0 @@
-*** /dev/null
---- /dev/null
-***************
-*** 53,57
-- 	    else
-- 	      @status = 403
-- 	      return Riddl::Parameter::Complex.new('data', 'application/json', {
-- 		:error => 'No authorization provided.'
-- 	      }.to_json)
---- 0 -----