From fc9124caf45949dfcc0732536c6825c12d74582a Mon Sep 17 00:00:00 2001 From: Prashanth Pai Date: Fri, 22 Nov 2013 12:13:09 +0530 Subject: gswauth: Fix 403 being returned instead of 401 - 401(Unauthorized) is to be returned when user credentials are wrong where as 403(Forbidden) is to be returned when user credentials are correct but the user doesn't have the priveleges to carry out the operation. - Also error messages displayed when using swauth-* command line utilities have been updated. Change-Id: I485786896ad14d3263f4325d1857cacc93adab96 Signed-off-by: Prashanth Pai Reviewed-on: http://review.gluster.org/6336 Reviewed-by: Luis Pabon Tested-by: Luis Pabon --- .../swift/common/middleware/gswauth/bin/swauth-delete-user | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gluster/swift/common/middleware/gswauth/bin/swauth-delete-user') diff --git a/gluster/swift/common/middleware/gswauth/bin/swauth-delete-user b/gluster/swift/common/middleware/gswauth/bin/swauth-delete-user index 3991d9a..d87d02b 100755 --- a/gluster/swift/common/middleware/gswauth/bin/swauth-delete-user +++ b/gluster/swift/common/middleware/gswauth/bin/swauth-delete-user @@ -57,4 +57,14 @@ if __name__ == '__main__': ssl=(parsed.scheme == 'https')) resp = conn.getresponse() if resp.status // 100 != 2: - exit('User deletion failed: %s %s' % (resp.status, resp.reason)) + if resp.status == 401: + exit('Delete user failed: %s %s: Invalid user/key provided' % + (resp.status, resp.reason)) + elif resp.status == 403: + exit('Delete user failed: %s %s: Insufficient priveleges' % + (resp.status, resp.reason)) + elif resp.status == 404: + exit('Delete user failed: %s %s: User %s does not exist' % + (resp.status, resp.reason, user)) + else: + exit('Delete user failed: %s %s' % (resp.status, resp.reason)) -- cgit