moving existing swauth unit tests
moving existing swauth unit tests to gluster-swift unit tests location Change-Id: I3445b7ef1a1abe584854f2b04ffc9949b3346814 Signed-off-by: Thiago da Silva <thiago@redhat.com> Reviewed-on: http://review.gluster.org/6106 Reviewed-by: Luis Pabon <lpabon@redhat.com> Tested-by: Luis Pabon <lpabon@redhat.com>
This commit is contained in:
parent
c86bf48f72
commit
cadaed4627
0
gluster/swift/common/middleware/__init__.py
Normal file
0
gluster/swift/common/middleware/__init__.py
Normal file
0
gluster/swift/common/middleware/gswauth/__init__.py
Normal file
0
gluster/swift/common/middleware/gswauth/__init__.py
Normal file
@ -39,8 +39,8 @@ from swift.common.utils import cache_from_env, get_logger, get_remote_client, \
|
||||
split_path, TRUE_VALUES, urlparse
|
||||
import swift.common.wsgi
|
||||
|
||||
from swauth import swift_version
|
||||
import swauth.authtypes
|
||||
from gluster.swift.common.middleware.gswauth.swauth import swift_version
|
||||
from gluster.swift.common.middleware.gswauth.swauth import authtypes
|
||||
|
||||
|
||||
MEMCACHE_TIME = swift_version.newer_than('1.7.7-dev')
|
||||
@ -139,7 +139,7 @@ class Swauth(object):
|
||||
# Get an instance of our auth_type encoder for saving and checking the
|
||||
# user's key
|
||||
self.auth_type = conf.get('auth_type', 'Plaintext').title()
|
||||
self.auth_encoder = getattr(swauth.authtypes, self.auth_type, None)
|
||||
self.auth_encoder = getattr(authtypes, self.auth_type, None)
|
||||
if self.auth_encoder is None:
|
||||
raise Exception(
|
||||
'Invalid auth_type in config file: %s'
|
||||
@ -203,7 +203,7 @@ class Swauth(object):
|
||||
return self.handle(env, start_response)
|
||||
s3 = env.get('HTTP_AUTHORIZATION')
|
||||
token = env.get('HTTP_X_AUTH_TOKEN', env.get('HTTP_X_STORAGE_TOKEN'))
|
||||
if token and len(token) > swauth.authtypes.MAX_TOKEN_LENGTH:
|
||||
if token and len(token) > authtypes.MAX_TOKEN_LENGTH:
|
||||
return HTTPBadRequest(body='Token exceeds maximum length.')(
|
||||
env, start_response)
|
||||
if s3 or (token and token.startswith(self.reseller_prefix)):
|
||||
|
0
test/unit/common/middleware/__init__.py
Normal file
0
test/unit/common/middleware/__init__.py
Normal file
0
test/unit/common/middleware/gswauth/__init__.py
Normal file
0
test/unit/common/middleware/gswauth/__init__.py
Normal file
63
test/unit/common/middleware/gswauth/swauth/test_authtypes.py
Normal file
63
test/unit/common/middleware/gswauth/swauth/test_authtypes.py
Normal file
@ -0,0 +1,63 @@
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
# implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# Pablo Llopis 2011
|
||||
|
||||
import unittest
|
||||
import gluster.swift.common.middleware.gswauth.swauth.authtypes as authtypes
|
||||
|
||||
|
||||
class TestPlaintext(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.auth_encoder = authtypes.Plaintext()
|
||||
|
||||
def test_plaintext_encode(self):
|
||||
enc_key = self.auth_encoder.encode('keystring')
|
||||
self.assertEquals('plaintext:keystring', enc_key)
|
||||
|
||||
def test_plaintext_valid_match(self):
|
||||
creds = 'plaintext:keystring'
|
||||
match = self.auth_encoder.match('keystring', creds)
|
||||
self.assertEquals(match, True)
|
||||
|
||||
def test_plaintext_invalid_match(self):
|
||||
creds = 'plaintext:other-keystring'
|
||||
match = self.auth_encoder.match('keystring', creds)
|
||||
self.assertEquals(match, False)
|
||||
|
||||
|
||||
class TestSha1(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.auth_encoder = authtypes.Sha1()
|
||||
self.auth_encoder.salt = 'salt'
|
||||
|
||||
def test_sha1_encode(self):
|
||||
enc_key = self.auth_encoder.encode('keystring')
|
||||
self.assertEquals('sha1:salt$d50dc700c296e23ce5b41f7431a0e01f69010f06',
|
||||
enc_key)
|
||||
|
||||
def test_sha1_valid_match(self):
|
||||
creds = 'sha1:salt$d50dc700c296e23ce5b41f7431a0e01f69010f06'
|
||||
match = self.auth_encoder.match('keystring', creds)
|
||||
self.assertEquals(match, True)
|
||||
|
||||
def test_sha1_invalid_match(self):
|
||||
creds = 'sha1:salt$deadbabedeadbabedeadbabec0ffeebadc0ffeee'
|
||||
match = self.auth_encoder.match('keystring', creds)
|
||||
self.assertEquals(match, False)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
4520
test/unit/common/middleware/gswauth/swauth/test_middleware.py
Normal file
4520
test/unit/common/middleware/gswauth/swauth/test_middleware.py
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user