summaryrefslogtreecommitdiff
path: root/lib/mixlib
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2015-11-30 10:37:11 -0800
committerJay Mundrawala <jdmundrawala@gmail.com>2015-11-30 10:37:11 -0800
commit53fa0aa303713a99261d5182ccfea0c3bb06deb4 (patch)
treefb58c97b59a65b0b834dc06f5256ab34ed9193cb /lib/mixlib
parent09d47bde7f833fb13c59dac1fa12bd8a5c209106 (diff)
downloadmixlib-authentication-53fa0aa303713a99261d5182ccfea0c3bb06deb4.tar.gz
Use DEFAULT_SERVER_API_VERSION in all the placesjdm/sign-v1.3
Diffstat (limited to 'lib/mixlib')
-rw-r--r--lib/mixlib/authentication.rb2
-rw-r--r--lib/mixlib/authentication/http_authentication_request.rb2
-rw-r--r--lib/mixlib/authentication/signedheaderauth.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/mixlib/authentication.rb b/lib/mixlib/authentication.rb
index ab10db7..245aa24 100644
--- a/lib/mixlib/authentication.rb
+++ b/lib/mixlib/authentication.rb
@@ -20,6 +20,8 @@ require 'mixlib/log'
module Mixlib
module Authentication
+ DEFAULT_SERVER_API_VERSION = '0'
+
class AuthenticationError < StandardError
end
diff --git a/lib/mixlib/authentication/http_authentication_request.rb b/lib/mixlib/authentication/http_authentication_request.rb
index efa8d80..ad8354f 100644
--- a/lib/mixlib/authentication/http_authentication_request.rb
+++ b/lib/mixlib/authentication/http_authentication_request.rb
@@ -65,7 +65,7 @@ module Mixlib
end
def server_api_version
- (headers[:x_ops_server_api_version] || '0').chomp
+ (headers[:x_ops_server_api_version] || DEFAULT_SERVER_API_VERSION).chomp
end
def request_signature
diff --git a/lib/mixlib/authentication/signedheaderauth.rb b/lib/mixlib/authentication/signedheaderauth.rb
index 27e0e6a..8faf313 100644
--- a/lib/mixlib/authentication/signedheaderauth.rb
+++ b/lib/mixlib/authentication/signedheaderauth.rb
@@ -44,8 +44,6 @@ module Mixlib
DEFAULT_SIGN_ALGORITHM = 'sha1'.freeze
DEFAULT_PROTO_VERSION = '1.0'.freeze
- DEFAULT_SERVER_API_VERSION = '0'
-
# === signing_object
# This is the intended interface for signing requests with the
# Opscode/Chef signed header protocol. This wraps the constructor for a