jungle_path 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf2e30fa1aa99e9ce5445d3edfa94e29930594b8
-  data.tar.gz: 58865df8e55ca302f53116c170dbcab565954667
+  metadata.gz: e3ebe41ea5d7710a0fab205f427b38f5daa8b24b
+  data.tar.gz: d632a687b7b51f6d3140b09858dd3cdd94a12cd3
 SHA512:
-  metadata.gz: 227f6aa4a18ad64b32cf2195daad216079a02670a0749a62d8f6b8b2e85ae4fd8a17cf0ad2e182c8b6db5b0b9c713530b3d8085ec995dafb2d27dc9e47e07317
-  data.tar.gz: 3586ccaeda9320cc290131bd231a6e2b70c69e4a4f231cebc3e83128d64e2b8e451d82056e7467fb79337179de8ee87282b1989e09ae888f721f44c4bfa9d51d
+  metadata.gz: ab6d3577b0460f11ec0f49eba0f56c8d0e71f50e60d8e9b95e013f8e1e8aa372ba936aef5273c6337b75a3996618721ac6b529f13a44b383a0dbe52ebeb3cb88
+  data.tar.gz: 94717868ea82807629fa185d2c4e2440b074064dcda3c4624121d3c265c4178026a55ffe66c015459d70eefa6fadd67ac846d0fb159b850252c7de1f7d2b4672

data/lib/jungle_path/app/auth/authorization.rb

@@ -33,7 +33,7 @@ module Auth
 				end
 
 				unless authorized
-					message = "request was not allowed.\n\nrequest: #{request.request_method} #{request.path_info}\nuser_name: #{current_user.user_name}\napi key name: #{current_key.name}\napi key value: #{current_key.key}\nroles: #{current_auth.roles}\npermissions: #{current_auth.permissions}\nrestrictions: #{current_auth.restrictions}"
+					message = "request was not allowed.\n\nrequest: #{request.request_method} #{request.path_info}\nuser_name: #{current_user.user_name}\nroles: #{current_auth.roles}\npermissions: #{current_auth.permissions}\nrestrictions: #{current_auth.restrictions}"
 					# http status code 403 Forbidden.
 					puts "request status: 403\n#{message}."
 					halt 403, message

data/lib/jungle_path/app/config/config.rb

@@ -112,14 +112,14 @@ module Config
 				id: 1,
 				name: :admin,
 				description: 'admin and add, edit and delete users, but not root users.',
-				permissions: [:admin],
+				permissions: [:admin, :read],
 				restrictions: []
 			},
 			user: {
 				id: 2,
 				name: :user,
 				description: 'basic system user -- has read only access.',
-				permissions: [:read],
+				permissions: [:read, :assumable_user_identity],
 				restrictions: [:query_only, :me_related]
 			}
 		}

data/lib/jungle_path/app/ztools/zbootstrapdata.rb

@@ -22,11 +22,12 @@ module ZBootstrap
       db.insert._model(schema_info)
     end
 
-    hash = 'sha1:1000:/CloeFSPBOT7Ac/Jf/qQLk59iQbflhxf:H4eHZ0w51f3UdQpM+tp2DdhofDPkTf2P\n'
+    hash = 'sha1:1000:/CloeFSPBOT7Ac/Jf/qQLk59iQbflhxf:H4eHZ0w51f3UdQpM+tp2DdhofDPkTf2P\n' # "test"
+    hash_zoo = 'sha1:1000:wNGOiLtzLt7U9t7g+AoQVYZBeZn4NDIl:WZ7ADLonzVbnMP+d0g4K94Rk06ai4Ezk\n' # "zoo"
     users = [
       Schema::User.new({id: 0, name: 'root', user_name: 'root', role: 'root', hash: hash, email: nil, active: true, created_by_user_id: 0, updated_by_user_id: 0}),
       Schema::User.new({id: 1, name: 'admin', user_name: 'admin', role: 'admin', hash: hash, email: nil, active: true, created_by_user_id: 0, updated_by_user_id: 0}),
-      Schema::User.new({id: 2, name: 'user', user_name: 'user', role: 'user', hash: hash, email: nil, active: true, created_by_user_id: 0, updated_by_user_id: 0})
+      Schema::User.new({id: 2, name: 'user', user_name: 'user', role: 'user', hash: hash_zoo, email: nil, active: true, created_by_user_id: 0, updated_by_user_id: 0})
     ]
     users.each {|user| db.insert._model(user)}
 

data/lib/jungle_path/authentication/auth_provider/default.rb

@@ -21,18 +21,22 @@ module JunglePath
 
 					#valid = false
 
-					identity = authenticate_identity(data_provider, identity, no_cache)
+					identity = authenticate_identity(data_provider, identity, false, no_cache)
 					puts "authenticated identity: #{identity}."
 					identity = authorize_identity(data_provider, identity, no_cache)
 					puts "authorized identity: #{identity}."
 
 					if identity and identity.valid? and assume_identity
-						assume_identity = authenticate_identity(data_provider, assume_identity, no_cache)
-						puts "authenticated assume_identity: #{assume_identity}."
-						assume_identity = authorize_identity(data_provider, assume_identity, no_cache)
-						puts "authorized assume_identity: #{assume_identity}."
-						#valid = (assume_identity and assume_identity.valid?) or (identity and identity.valid?)
-						return assume_identity if assume_identity.valid?
+						if identity.authorization_filter.has_permission?(:assume_user_identity) and !identity.authorization_filter.has_restriction?(:assume_user_identity)
+							puts "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBb"
+							assume_identity = authenticate_identity(data_provider, assume_identity, true, no_cache)
+							puts "authenticated assume_identity: #{assume_identity}."
+							assume_identity = authorize_identity(data_provider, assume_identity, no_cache)
+							assume_identity.valid = false unless assume_identity.authorization_filter.has_permission?(:assumable_user_identity) and !assume_identity.authorization_filter.has_restriction?(:assumable_user_identity)
+							puts "authorized assume_identity: #{assume_identity}."
+							#valid = (assume_identity and assume_identity.valid?) or (identity and identity.valid?)
+						end
+						return assume_identity
 					end
 					identity
 				end
@@ -48,22 +52,22 @@ module JunglePath
 						assume_identity = JunglePath::Authentication::Identity.new
 						assume_identity.user_name = parts[0]
 						assume_identity.remote_user = remote_user
-						assume_identity.remote_password = remote_password
+						assume_identity.remote_password = nil
 					else
 						identity.user_name = remote_user
 					end
 					return identity, assume_identity
 				end
 
-				def authenticate_identity data_provider, identity, no_cache=false
+				def authenticate_identity data_provider, identity, assume_identity=false, no_cache=false
 					idn = nil
 					if identity
 						idn = identity.dup
 						if user_name_is_key? identity.user_name, identity.remote_password
-							idn.user = data_provider.get_user_by_key(identity.user_name, no_cache, identity.remote_password)
+							idn.user = data_provider.get_user_by_key(identity.user_name, assume_identity, no_cache, identity.remote_password)
 							idn.key = identity.user_name
 						else
-							idn.user = data_provider.get_user(identity.user_name, identity.remote_password, no_cache)
+							idn.user = data_provider.get_user(identity.user_name, identity.remote_password, assume_identity, no_cache)
 							idn.key = nil
 						end
 						idn.valid = (idn.user and idn.user.is_valid)

data/lib/jungle_path/authentication/data_provider/default.rb

@@ -28,7 +28,7 @@ module JunglePath
 					@alternative_user_key_query = alternative_user_key_query
 				end
 
-				def get_user(user_name, password, no_cache=false)
+				def get_user(user_name, password, assume_identity=false, no_cache=false)
 					lower_case_user_name = nil
 					lower_case_user_name = user_name.downcase.to_sym if user_name
 					cache_key = "#{lower_case_user_name}.#{password}"
@@ -41,14 +41,15 @@ module JunglePath
 						user = @user_model.new(hash, false) if hash
 						@sinatra.halt 401, "Unauthorized" unless user
 						@sinatra.halt 401, "Unauthorized: user #{user.user_name} is not marked as active." unless user.active
-						user.is_valid = JunglePath::Authentication::PasswordHash.validate_password(password, user.hash)
+						user.is_valid = assume_identity
+						user.is_valid = JunglePath::Authentication::PasswordHash.validate_password(password, user.hash) unless assume_identity
 						user.password = password
 						@cache[cache_key] = user if user
 					end
 					user
 				end
 
-				def get_user_by_key(key, no_cache=false, password=nil)
+				def get_user_by_key(key, assume_identity=false, no_cache=false, password=nil)
 					cache_key = "#{key}."
 					user = @cache[cache_key]
 					if user == nil or no_cache

data/lib/jungle_path/authentication/data_provider/test.rb

@@ -61,7 +61,9 @@ module JunglePath
 							active: true,
 							user_name: :user,
 							#password: 'test',
-							hash: 'sha1:1000:/CloeFSPBOT7Ac/Jf/qQLk59iQbflhxf:H4eHZ0w51f3UdQpM+tp2DdhofDPkTf2P\n',
+							#hash: 'sha1:1000:/CloeFSPBOT7Ac/Jf/qQLk59iQbflhxf:H4eHZ0w51f3UdQpM+tp2DdhofDPkTf2P\n',
+							#password: 'zoo',
+							hash: 'sha1:1000:wNGOiLtzLt7U9t7g+AoQVYZBeZn4NDIl:WZ7ADLonzVbnMP+d0g4K94Rk06ai4Ezk\n',
 							role: :user
 						}
 					}
@@ -98,7 +100,7 @@ module JunglePath
 					end
 				end
 
-				def get_user(user_name, password, no_cache=false)
+				def get_user(user_name, password, assume_identity=false, no_cache=false)
 					lower_case_user_name = nil
 					lower_case_user_name = user_name.downcase.to_sym if user_name
 					hash = @users[lower_case_user_name]
@@ -107,13 +109,14 @@ module JunglePath
 					halt 401, "Unauthorized: user #{user.user_name} is not marked as active." unless user.active
 					#user.is_valid = (user.password == password)
 					#user.password = password
-					user.is_valid = JunglePath::Authentication::PasswordHash.validate_password(password, user.hash)
+					user.is_valid = assume_identity
+					user.is_valid = JunglePath::Authentication::PasswordHash.validate_password(password, user.hash) unless assume_identity
 					user.password = password
 					user
 				end
 
-				def get_user_by_key(key, no_cache=false, password=nil)
-					get_user(user_name, password, no_cache)
+				def get_user_by_key(key, assume_identity=false, no_cache=false, password=nil)
+					get_user(user_name, password, assume_identity, no_cache)
 				end
 
 				def get_role(identity, no_cache=false)

data/lib/jungle_path/authorization/filter.rb

@@ -29,7 +29,9 @@ module JunglePath
 				puts "@permissions.keys #{@permissions.keys}."
 				puts "has_permission? #{permission_name}."
 				symbol = permission_name.to_sym
-				symbol == @permissions[symbol]
+				has_it = symbol == @permissions[symbol]
+				has_it = :root == @permissions[:root] unless has_it
+				has_it
 			end
 
 			def has_restriction? restriction_name

data/lib/jungle_path/version.rb

@@ -1,3 +1,3 @@
 module JunglePath
-	VERSION = '0.0.9'
+	VERSION = '0.0.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jungle_path
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Michael VanZant