oxd-ruby 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: becb5e6cf7b08da462269a04cb94f5df77c9a903
-  data.tar.gz: e39d828b7f16eaf9a0a70e1eb70828065bc1c603
+  metadata.gz: 3c927e7af3f706adb71804447f38b290df3cb5b1
+  data.tar.gz: cf118779fe069f932110fc38477e990adddd6fb1
 SHA512:
-  metadata.gz: 785054ee62b5971ac043b85987086f115c5d23052556182649b78ff34e335f307a6bd36c265b99c3c997079ef9458f049585c1a69bfbe3b6e1db0d947c7a0df6
-  data.tar.gz: 9d21df5d8571a358ef2bc5f56c22b1c384fb4adde6cbca19cf1c045880fa942b7ec0b2b7a1a6734da17136da7b80abc89c00f654dc3b3149bdd6b7a068563d75
+  metadata.gz: a8b71232f3ecb9c829eba9511ecf6232f7ba9429e18e1afc7f69b62b79aad9ad173e949baa2a3286c21e586f98f7c5b42e38a6408829fcd5371f6cd41f16d2f2
+  data.tar.gz: 116fc42fff057ff8840ecc90493fd1abf4bd978dfc9c065592d7f29a53b6d53801e39fd32646a897a786109d8dc8287cb5c18ba8d167c894bd9d3d66c2018858

data/.gitignore

@@ -6,4 +6,4 @@
 /doc/
 /pkg/
 /spec/reports/
-/tmp/
+/tmp/

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [0.1.8] - 2017-05-16
+### Added
+- support for oxd-to-http
+
 ## [0.1.7] - 2017-03-10
 ### Added
 - `state` parameter in `get_tokens_by_code` command
@@ -34,4 +38,4 @@ All notable changes to this project will be documented in this file.
 - support for oxd-server 2.4.4
 - support for UMA
 - `config.op_host` parameter in configuration
-- added scopes "uma_protection","uma_authorization"
+- added scopes "uma_protection","uma_authorization"

data/README.md

@@ -24,7 +24,7 @@ Oxd-server needs to be running on your machine to connect with OP.
 To install gem, add this line to your application's Gemfile:
 
 ```ruby
-gem 'oxd-ruby', '~> 0.1.7'
+gem 'oxd-ruby', '~> 0.1.8'
 ```
 
 Run bundle command to install it:

data/demosite/Gemfile

@@ -33,7 +33,7 @@ gem "twitter-bootstrap-rails"
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 
-gem 'oxd-ruby', '~> 0.1.7'
+gem 'oxd-ruby', '~> 0.1.8'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
@@ -46,4 +46,4 @@ group :development do
 
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
-end
+end

data/lib/oxd/client_oxd_commands.rb

@@ -16,6 +16,7 @@ module Oxd
 
 		# @return [String] oxd_id of the registered website
 		# method to register the website and generate a unique ID for that website
+		# works with both oxd-to-http and oxd-server
 		def register_site			
 			if(!@configuration.oxd_id.empty?) # Check if client is already registered
 				return @configuration.oxd_id
@@ -38,7 +39,7 @@ module Oxd
 		            "client_secret"=> @configuration.client_secret,
 		            "client_id"=> @configuration.client_id
 		        }
-		        request
+		        request('register-site')
 		        @configuration.oxd_id = getResponseData['oxd_id']
 		    end	        
 		end
@@ -51,6 +52,7 @@ module Oxd
 		# @param acr_values [Array] OPTIONAL, list of acr values in the order of priority
 		# @return [String] authorization_url
 		# method to get authorization url that the user must be redirected to for authorization and authentication
+		# works with both oxd-to-http and oxd-server
 		def get_authorization_url(acr_values = [""])
 			@command = 'get_authorization_url'
 			@params = {
@@ -58,7 +60,7 @@ module Oxd
 	            "prompt" => @configuration.prompt,
 	            "acr_values" => acr_values || @configuration.acr_values
         	}
-		    request
+		    request('get-authorization-url')
 		    getResponseData['authorization_url']
 		end
 
@@ -66,6 +68,7 @@ module Oxd
 		# @param state [String] state obtained from the authorization url callback
 		# @return [Hash] {:access_token, :id_token}
 		# method to retrieve access token. It is called after the user authorizes by visiting the authorization url.
+		# works with both oxd-to-http and oxd-server
 		def get_tokens_by_code( code,state )
             if (code.empty?)
             	logger(:log_msg => "Empty/Wrong value in place of code.")
@@ -76,7 +79,7 @@ module Oxd
 	            "code" => code,
 	            "state" => state
         	}        	
-			request
+			request('get-tokens-by-code')
 			@configuration.id_token = getResponseData['id_token']
 			getResponseData['access_token']
 		end
@@ -84,6 +87,7 @@ module Oxd
 		# @param access_token [String] access token recieved from the get_tokens_by_code command
 		# @return [String] user data claims that are returned by the OP
 		# get the information about the user using the access token obtained from the OP
+		# works with both oxd-to-http and oxd-server
 		def get_user_info(access_token)
 			if access_token.empty?
 	            logger(:log_msg => "Empty access code sent for get_user_info", :error => "Empty access code")
@@ -93,7 +97,7 @@ module Oxd
 	            "oxd_id" => @configuration.oxd_id,
 	            "access_token" => access_token
         	}
-        	request
+        	request('get-user-info')
 			getResponseData['claims']
 		end
 	
@@ -101,6 +105,7 @@ module Oxd
 		# @param session_state [String] OPTIONAL, session state obtained from the authorization url callback
 		# @return [String] uri
 		# method to retrieve logout url from OP. User must be redirected to this url to perform logout
+		# works with both oxd-to-http and oxd-server
 		def get_logout_uri( state = nil, session_state = nil)
 			@command = 'get_logout_uri'
 			@params = {
@@ -110,7 +115,7 @@ module Oxd
 	            "state" => state,
 	            "session_state" => session_state
         	}
-        	request
+        	request('logout')
         	getResponseData['uri']
         	#@configuration.oxd_id = "" #unset oxd_id after logout
 		end
@@ -118,6 +123,7 @@ module Oxd
 		# @return [Boolean] status - if site registration was updated successfully or not
 		# method to update the website's information with OpenID Provider. 
 		# 	This should be called after changing the values in the oxd_config file.
+		# works with both oxd-to-http and oxd-server
 		def update_site_registration
 	    	@command = 'update_site_registration'
         	@params = {
@@ -136,7 +142,7 @@ module Oxd
 	            "client_secret_expires_at" => 3080736637943,
 	            "client_logout_uris"=> @configuration.client_logout_uris
 	        }
-	        request
+	        request('update-site-registration')
 	        if @response_object['status'] == "ok"
 	        	@configuration.oxd_id = getResponseData['oxd_id']
 	            return true
@@ -145,4 +151,4 @@ module Oxd
 	        end
 		end
 	end
-end
+end

data/lib/oxd/oxd_connector.rb

@@ -1,5 +1,8 @@
 require 'socket'
 require 'ipaddr'
+require 'net/http'
+require 'json'
+require 'uri'
 
 # @author Inderpal Singh
 # @note supports oxd-version 2.4.4
@@ -55,38 +58,68 @@ module Oxd
 	        if(socket.close)
 	        	logger(:log_msg => "Client: oxd_socket_connection : disconnected.", :error => "")
 	        end
+	        #logger(:log_msg => response)
+			#abort
 	        return response
 		end
+		
+		# method to communicate with the oxD-to-http server
+		# @param request [JSON] representation of the JSON command string
+		# @param char_count [Integer] number of characters to read from response
+		# @return response from the oxD-to-http server
+		def oxd_http_request(requst, command = "")
+			uri = URI.parse("https://127.0.0.1/"+command)
+			http = Net::HTTP.new("127.0.0.1", 8443)
+			http.use_ssl = true
+			http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+			request = Net::HTTP::Post.new(uri.request_uri)
+			request.add_field('Content-Type', 'application/json')
+			request.body = requst
+			response = http.request(request)
+			response2 = response.body
+			return response2
+		end
 
-		# method to send commands to the oxD server and to recieve the response via {#oxd_socket_request}
+		# @param comm [String] command string for oxd-to-http
+		# method to send commands to the oxD server and oxd-to-http and to recieve the response via {#oxd_socket_request}
 		# @return [JSON] @response_object : response from the oxd server in JSON form
-	    def request
+	    def request(comm = "")
+			
 	    	uri = URI.parse(@configuration.authorization_redirect_uri)	
 			logger(:log_msg => "Please enable SSL on your website or check URIs in Oxd configuration.") if (uri.scheme != 'https')
 	    	validate_command
-	    	jsondata = getData.to_json
-	    	if(!is_json? (jsondata))
-	    		logger(:log_msg => "Sending parameters must be JSON. Exiting process.")
-	        end
-	        length = jsondata.length
-	        if( length <= 0 )
-	    		logger(:log_msg => "JSON data length must be more than zero. Exiting process.")
+	    	
+	    	if(@configuration.oxd_host_port == 8099)
+				jsondata = getData.to_json
+				if(!is_json? (jsondata))
+					logger(:log_msg => "Sending parameters must be JSON. Exiting process.")
+				end
+				length = jsondata.length
+				if( length <= 0 )
+					logger(:log_msg => "JSON data length must be more than zero. Exiting process.")
+				else
+					length = length <= 999 ? sprintf('0%d', length) : length
+				end
+				@response_json = oxd_socket_request((length.to_s + jsondata).encode("UTF-8"))
+				@response_json.sub!(@response_json[0..3], "")
 	        else
-	            length = length <= 999 ? sprintf('0%d', length) : length
+				jsondata = getData2.to_json
+				@response_json = oxd_http_request(jsondata, comm)
 	        end
-	        @response_json = oxd_socket_request((length.to_s + jsondata).encode("UTF-8"))
-	        @response_json.sub!(@response_json[0..3], "")
+
 
 	        if (@response_json)
 	            response = JSON.parse(@response_json)
 	            if (response['status'] == 'error') 
 	    			logger(:log_msg => "OxD Server Error : #{response['data']['error_description']}")
-	            elsif (response['status'] == 'ok') 
+	            elsif (response['status'] == 'ok')
+					
 	                @response_object = JSON.parse(@response_json)
 	            end
 	        else
 	        	logger(:log_msg => "Response is empty. Exiting process.")
 	        end
+	        
 	        return @response_object
 	    end
 
@@ -112,6 +145,11 @@ module Oxd
 	    	@data = {'command' => @command, 'params' => @params}
         	return @data
 	    end
+	    
+	    def getData2
+	    	@data = @params
+        	return @data
+	    end
 
     	# checks whether the passed string is in JSON format or not
     	# @param  string_to_validate [String]
@@ -137,4 +175,4 @@ module Oxd
 			raise (args[:error] || args[:log_msg]) if args[:error] != ""
 		end		
 	end
-end
+end

data/lib/oxd/version.rb

@@ -1,4 +1,4 @@
 # Gem version
 module Oxd
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
 end

data/oxd-ruby.gemspec

@@ -21,4 +21,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-rails"
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxd-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - inderpal6785
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -174,10 +174,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby Client Library for Oxd Server - OpenID Connect Client RP Middleware,
   which organizes authentication and registration of users.
 test_files: []
-has_rdoc: