summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrautenberg <rautenberg@in-silico.ch>2012-03-30 17:57:28 +0200
committerrautenberg <rautenberg@in-silico.ch>2012-03-30 17:57:28 +0200
commit1af7ec09719869f11fc54696b90e1e8c4f91660e (patch)
treee0e4c9a33ca28c9eaed72b5f8f9da634cabfa5a7
parent4f24ed045d78e4cc3493dd65da629e5761b07ba5 (diff)
temporary https solution
-rw-r--r--lib/authorization-helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/authorization-helper.rb b/lib/authorization-helper.rb
index 3e44c9c..92bc865 100644
--- a/lib/authorization-helper.rb
+++ b/lib/authorization-helper.rb
@@ -55,7 +55,7 @@ module OpenTox
end
elsif !env["session"] && subjectid
unless authorized?(subjectid)
- $logger.debug "URI not authorized: clean: " + clean_uri("#{request.env['rack.url_scheme']}://#{request.env['HTTP_HOST']}#{request.env['REQUEST_URI']}").to_s + " full: #{request.env['rack.url_scheme']}://#{request.env['HTTP_HOST']}#{request.env['REQUEST_URI']} with request: #{request.env['REQUEST_METHOD']}"
+ $logger.debug "URI not authorized: clean: " + clean_uri("#{request.env['rack.url_scheme']}://#{request.env['HTTP_HOST']}#{request.env['REQUEST_URI']}").sub("http://","https://").to_s + " full: #{request.env['rack.url_scheme']}://#{request.env['HTTP_HOST']}#{request.env['REQUEST_URI']} with request: #{request.env['REQUEST_METHOD']}"
raise OpenTox::NotAuthorizedError.new "Not authorized"
end
else
@@ -67,7 +67,7 @@ module OpenTox
# @param [String]subjectid
def authorized?(subjectid)
request_method = request.env['REQUEST_METHOD']
- uri = clean_uri("#{request.env['rack.url_scheme']}://#{request.env['HTTP_HOST']}#{request.env['REQUEST_URI']}")
+ uri = clean_uri("#{request.env['rack.url_scheme']}://#{request.env['HTTP_HOST']}#{request.env['REQUEST_URI']}").sub("http://","https://")
request_method = "GET" if request_method == "POST" && uri =~ /\/model\/\d+\/?$/
return OpenTox::Authorization.authorized?(uri, request_method, subjectid)
end