Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow OAuth params via the query string or form #9

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow OAuth params via the query string or form #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fbff2a
Comment out tests that refer to non-existent vars
joelittlejohn Apr 1, 2014
83e436d
Allow oauth params via the query string or form
joelittlejohn Apr 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/oauth_server/server.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,16 @@
(map (fn [x] {(keyword ( x 1)) (sig/url-decode (x 2))})
(re-seq #"(oauth_[^=, ]+)=\"([^\"]*)\"" auth)))))

(defn parse-oauth-requestparams
"Parses the oauth values from the form or query params"
[request]
(not-empty (select-keys (:params request) [:oauth_consumer_key :oauth_callback :oauth_nonce
:oauth_signature :oauth_signature_method :oauth_timestamp
:oauth_token :oauth_version])))

(defn oauth-params [request]
(parse-oauth-header ((or (request :headers) {}) "authorization")))
(or (parse-oauth-header ((or (request :headers) {}) "authorization"))
(parse-oauth-requestparams request)))

(defn request-method [request] (upper-case (as-str (request :request-method))))

Expand All @@ -41,7 +49,7 @@
(apply dissoc (:params req) (keys (:route-params req))))

(defn request-parameters [request]
(merge (dissoc (oauth-params request) :oauth_signature) (params-without-route request)))
(dissoc (merge (oauth-params request) (params-without-route request)) :oauth_signature))

(defn request-base-string
"creates a signature base string from a ring request"
Expand Down
240 changes: 131 additions & 109 deletions test/oauth_server/server_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,47 @@
(is (= (os/parse-oauth-header "Basic realm=\"Secure Area\"") nil))
(is (= (os/parse-oauth-header "") nil))
(is (= (os/parse-oauth-header nil) nil))
)
)

(deftest
#^{:doc "Test extraction of oauth parameters."}
#^{:doc "Test parsing of oauth values from request params."}
parse-oauth-requestparams
(is (= (os/parse-oauth-requestparams {:params {:oauth_consumer_key "0685bd9184jfhq22"
:oauth_token "ad180jjd733klru7"
:oauth_signature_method "HMAC-SHA1"
:oauth_signature "wOJIO9A2W5mFwDgiDvZbTSMK/PY="
:oauth_timestamp "137131200"
:oauth_nonce "4572616e48616d6d65724c61686176"
:oauth_version "1.0"
:other-param "xxx"}})
{:oauth_consumer_key "0685bd9184jfhq22"
:oauth_token "ad180jjd733klru7"
:oauth_signature_method "HMAC-SHA1"
:oauth_signature "wOJIO9A2W5mFwDgiDvZbTSMK/PY="
:oauth_timestamp "137131200"
:oauth_nonce "4572616e48616d6d65724c61686176"
:oauth_version "1.0"})))


(deftest
#^{:doc "Test extraction of oauth parameters."}
oauth-params
(is (= (os/oauth-params {:headers {}}) nil))
(is (= (os/oauth-params {:headers {:authorize "Basic realm=\"Secure Area\""}}) nil))
(is (= (os/oauth-params {:headers
{ :authorize "OAuth realm=\"http://sp.example.com/\", oauth_consumer_key=\"0685bd9184jfhq22\", oauth_token=\"ad180jjd733klru7\", oauth_signature_method=\"HMAC-SHA1\", oauth_signature=\"wOJIO9A2W5mFwDgiDvZbTSMK%2FPY%3D\", oauth_timestamp=\"137131200\", oauth_nonce=\"4572616e48616d6d65724c61686176\",oauth_version=\"1.0\""}})
{ :oauth_consumer_key "0685bd9184jfhq22"
:oauth_token "ad180jjd733klru7"
:oauth_signature_method "HMAC-SHA1"
:oauth_signature "wOJIO9A2W5mFwDgiDvZbTSMK/PY="
:oauth_timestamp "137131200"
:oauth_nonce "4572616e48616d6d65724c61686176"
:oauth_version "1.0"
}))
)

(is (= (os/oauth-params {:headers {"authorization" "Basic realm=\"Secure Area\""}}) nil))
(is (= (os/oauth-params {:headers
{ "authorization" "OAuth realm=\"http://sp.example.com/\", oauth_consumer_key=\"0685bd9184jfhq22\", oauth_token=\"ad180jjd733klru7\", oauth_signature_method=\"HMAC-SHA1\", oauth_signature=\"wOJIO9A2W5mFwDgiDvZbTSMK%2FPY%3D\", oauth_timestamp=\"137131200\", oauth_nonce=\"4572616e48616d6d65724c61686176\",oauth_version=\"1.0\""}})
{:oauth_consumer_key "0685bd9184jfhq22"
:oauth_token "ad180jjd733klru7"
:oauth_signature_method "HMAC-SHA1"
:oauth_signature "wOJIO9A2W5mFwDgiDvZbTSMK/PY="
:oauth_timestamp "137131200"
:oauth_nonce "4572616e48616d6d65724c61686176"
:oauth_version "1.0"
}))
(is (= (os/oauth-params {:headers {}
:params {:oauth_consumer_key "0685bd9184jfhq22"}})
{:oauth_consumer_key "0685bd9184jfhq22"})))

(deftest
request-method
(is (= "GET" (os/request-method {:request-method :get})))
Expand Down Expand Up @@ -120,101 +142,101 @@
:scheme :http
:params {:file "vacation.jpg" :size "original"}
:headers { :authorize "OAuth realm=\"http://sp.example.com/\", oauth_consumer_key=\"dpf43f3p2l4k3l03\", oauth_signature_method=\"PLAINTEXT\", oauth_signature=\"kd94hf93k423kf44%26\", oauth_timestamp=\"1191242096\", oauth_nonce=\"kllo9940pd9333jh\",oauth_version=\"1.0\""}}) :status)))))

(deftest
#^{:doc "token request"}
request-token
(let [consumer (store/create-consumer :memory)]
(is (= 401 ((oc/request-token :memory {} ) :status)))
(is (= 401 ((oc/request-token :memory {:oauth-consumer consumer }) :status)))
(is (= 200 ((oc/request-token :memory {:oauth-consumer consumer :oauth-params {:oauth_callback "http://blabla.inv/callback"}}) :status)))
(is (= 200 ((oc/request-token :memory {:oauth-consumer consumer :oauth-params {:oauth_callback "oob"}}) :status)))
(let [token-body ((oc/request-token :memory
{:oauth-consumer consumer :oauth-params {:oauth_callback "http://blabla.inv/callback"}}) :body )
token-params (os/parse-form-encoded token-body)]
(is (not (nil? token-body)))
(is (not (nil? token-params)))
(is (not (nil? (token-params :oauth_token))))
(is (not (nil? (token-params :oauth_secret))))
(is (= (token-params :oauth_callback_confirmed) "true"))
(is (nil? (token-params :oauth_verifier)))
(let [token (store/get-request-token :memory (token-params :oauth_token))]
(is (not (nil? token)))
(is (= (token :token) (token-params :oauth_token)))
(is (= (token :secret) (token-params :oauth_secret)))
(is (= (token :consumer) consumer))
(is (not (nil? (token :verifier))))
)
))
)

;;
(deftest
#^{:doc "integrated token request in app using example from http://oauth.net/core/1.0a/#anchor43"}
integrated-token-request
(let [oauth-app (os/wrap-oauth (os/oauth-token-manager app :memory ) :memory)
_ (store/store-consumer :memory {:key "dpf43f3p2l4k3l03" :secret "kd94hf93k423kf44"})]
(is (= 401 ((oauth-app {}) :status)))
(is (= 401 ((oauth-app {:headers { :authorize "Basic realm=\"Secure Area\""}}) :status)))
(is (= 401 ((oauth-app {:headers { :authorize "OAuth realm=\"https://photos.example.net/\", oauth_consumer_key=\"dpf43f3p2l4k3l03\", oauth_signature_method=\"HMAC-SHA1\", oauth_signature=\"fake\", oauth_timestamp=\"1191242090\", oauth_nonce=\"hsu94j3884jdopsl\", oauth_version=\"1.0\", oauth_callback=\"http%3A%2F%2Fprinter.example.com%2Frequest_token_ready\""}}) :status)))

(let [ response (oauth-app {
:request-method :post
:server-name "photos.example.net"
:uri "/oauth/request_token"
:scheme :https
:headers { :authorize "OAuth realm=\"https://photos.example.net/\", oauth_consumer_key=\"dpf43f3p2l4k3l03\", oauth_signature_method=\"PLAINTEXT\", oauth_signature=\"kd94hf93k423kf44%26\", oauth_timestamp=\"1191242090\", oauth_nonce=\"hsu94j3884jdopsl\", oauth_callback=\"http://printer.example.com/request_token_ready\" oauth_version=\"1.0\""}})
token-body (response :body)
_ (println token-body)
token-params (os/parse-form-encoded (response :body))]
(is(= 200 (response :status)))
(is (not (nil? token-body)))
(is (not (nil? token-params)))
(is (not (nil? (token-params :oauth_token))))
(is (not (nil? (token-params :oauth_secret))))
(is (= (token-params :oauth_callback_confirmed) "true"))
(is (nil? (token-params :oauth_verifier)))
(let [token (store/get-request-token :memory (token-params :oauth_token))]
(is (not (nil? token)))
(is (= (token :token) (token-params :oauth_token)))
(is (= (token :secret) (token-params :oauth_secret)))
(is (= (token :consumer) (store/get-consumer :memory "dpf43f3p2l4k3l03")))
(is (not (nil? (token :verifier))))
(comment
(deftest
#^{:doc "token request"}
request-token
(let [consumer (store/create-consumer :memory)]
(is (= 401 ((oc/request-token :memory {} ) :status)))
(is (= 401 ((oc/request-token :memory {:oauth-consumer consumer }) :status)))
(is (= 200 ((oc/request-token :memory {:oauth-consumer consumer :oauth-params {:oauth_callback "http://blabla.inv/callback"}}) :status)))
(is (= 200 ((oc/request-token :memory {:oauth-consumer consumer :oauth-params {:oauth_callback "oob"}}) :status)))
(let [token-body ((oc/request-token :memory
{:oauth-consumer consumer :oauth-params {:oauth_callback "http://blabla.inv/callback"}}) :body )
token-params (os/parse-form-encoded token-body)]
(is (not (nil? token-body)))
(is (not (nil? token-params)))
(is (not (nil? (token-params :oauth_token))))
(is (not (nil? (token-params :oauth_secret))))
(is (= (token-params :oauth_callback_confirmed) "true"))
(is (nil? (token-params :oauth_verifier)))
(let [token (store/get-request-token :memory (token-params :oauth_token))]
(is (not (nil? token)))
(is (= (token :token) (token-params :oauth_token)))
(is (= (token :secret) (token-params :oauth_secret)))
(is (= (token :consumer) consumer))
(is (not (nil? (token :verifier))))
)
))

))

))

(deftest
#^{:doc "access token request"}
access-token
(let [consumer (store/create-consumer :memory)
request-token (store/create-request-token :memory consumer "http://test.com/callback")
]
(is (= 401 ((os/access-token :memory {} ) :status)))
(is (= 401 ((os/access-token :memory { :oauth-consumer consumer }) :status)))
(is (= 401 ((os/access-token :memory { :oauth-consumer consumer :oauth-token request-token :oauth-params {:oauth_verifier (request-token :verifier)}}) :status)))
(is (= 401 ((os/access-token :memory { :oauth-consumer consumer :oauth-token request-token :oauth-params {:oauth_verifier (request-token :verifier)}}) :status)))
(do
(store/authorize-token :memory (request-token :token))
(let [request-token (store/get-request-token :memory (request-token :token))]
(is (= 401 ((os/access-token :memory { :oauth-consumer consumer :oauth-token request-token :oauth-params {} }) :status)))
(is (= 401 ((os/access-token :memory { :oauth-consumer consumer :oauth-token request-token :oauth-params {:oauth_verifier "fake"}}) :status)))
(let [ token-response (os/access-token :memory {:oauth-consumer consumer :oauth-token request-token
:oauth-params {:oauth_verifier (request-token :verifier)}})
token-params (os/parse-form-encoded (token-response :body))]
(is (= 200 (token-response :status)))
(is (not (nil? token-params)))
(is (not (nil? (token-params :oauth_token))))
(is (not (nil? (token-params :oauth_secret))))
(let [token (store/get-access-token :memory (token-params :oauth_token))]
(is (not (nil? token)))
(is (= (token :token) (token-params :oauth_token)))
(is (= (token :secret) (token-params :oauth_secret)))
(is (= (token :consumer) consumer))
)
))

)
))
(comment
(deftest
#^{:doc "integrated token request in app using example from http://oauth.net/core/1.0a/#anchor43"}
integrated-token-request
(let [oauth-app (os/wrap-oauth (os/oauth-token-manager app :memory ) :memory)
_ (store/store-consumer :memory {:key "dpf43f3p2l4k3l03" :secret "kd94hf93k423kf44"})]
(is (= 401 ((oauth-app {}) :status)))
(is (= 401 ((oauth-app {:headers { :authorize "Basic realm=\"Secure Area\""}}) :status)))
(is (= 401 ((oauth-app {:headers { :authorize "OAuth realm=\"https://photos.example.net/\", oauth_consumer_key=\"dpf43f3p2l4k3l03\", oauth_signature_method=\"HMAC-SHA1\", oauth_signature=\"fake\", oauth_timestamp=\"1191242090\", oauth_nonce=\"hsu94j3884jdopsl\", oauth_version=\"1.0\", oauth_callback=\"http%3A%2F%2Fprinter.example.com%2Frequest_token_ready\""}}) :status)))

(let [ response (oauth-app {
:request-method :post
:server-name "photos.example.net"
:uri "/oauth/request_token"
:scheme :https
:headers { :authorize "OAuth realm=\"https://photos.example.net/\", oauth_consumer_key=\"dpf43f3p2l4k3l03\", oauth_signature_method=\"PLAINTEXT\", oauth_signature=\"kd94hf93k423kf44%26\", oauth_timestamp=\"1191242090\", oauth_nonce=\"hsu94j3884jdopsl\", oauth_callback=\"http://printer.example.com/request_token_ready\" oauth_version=\"1.0\""}})
token-body (response :body)
_ (println token-body)
token-params (os/parse-form-encoded (response :body))]
(is(= 200 (response :status)))
(is (not (nil? token-body)))
(is (not (nil? token-params)))
(is (not (nil? (token-params :oauth_token))))
(is (not (nil? (token-params :oauth_secret))))
(is (= (token-params :oauth_callback_confirmed) "true"))
(is (nil? (token-params :oauth_verifier)))
(let [token (store/get-request-token :memory (token-params :oauth_token))]
(is (not (nil? token)))
(is (= (token :token) (token-params :oauth_token)))
(is (= (token :secret) (token-params :oauth_secret)))
(is (= (token :consumer) (store/get-consumer :memory "dpf43f3p2l4k3l03")))
(is (not (nil? (token :verifier))))
))

)))

(comment
(deftest
#^{:doc "access token request"}
access-token
(let [consumer (store/create-consumer :memory)
request-token (store/create-request-token :memory consumer "http://test.com/callback")
]
(is (= 401 ((os/access-token :memory {} ) :status)))
(is (= 401 ((os/access-token :memory { :oauth-consumer consumer }) :status)))
(is (= 401 ((os/access-token :memory { :oauth-consumer consumer :oauth-token request-token :oauth-params {:oauth_verifier (request-token :verifier)}}) :status)))
(is (= 401 ((os/access-token :memory { :oauth-consumer consumer :oauth-token request-token :oauth-params {:oauth_verifier (request-token :verifier)}}) :status)))
(do
(store/authorize-token :memory (request-token :token))
(let [request-token (store/get-request-token :memory (request-token :token))]
(is (= 401 ((os/access-token :memory { :oauth-consumer consumer :oauth-token request-token :oauth-params {} }) :status)))
(is (= 401 ((os/access-token :memory { :oauth-consumer consumer :oauth-token request-token :oauth-params {:oauth_verifier "fake"}}) :status)))
(let [ token-response (os/access-token :memory {:oauth-consumer consumer :oauth-token request-token
:oauth-params {:oauth_verifier (request-token :verifier)}})
token-params (os/parse-form-encoded (token-response :body))]
(is (= 200 (token-response :status)))
(is (not (nil? token-params)))
(is (not (nil? (token-params :oauth_token))))
(is (not (nil? (token-params :oauth_secret))))
(let [token (store/get-access-token :memory (token-params :oauth_token))]
(is (not (nil? token)))
(is (= (token :token) (token-params :oauth_token)))
(is (= (token :secret) (token-params :oauth_secret)))
(is (= (token :consumer) consumer))
)
))

)
)))