require service on auth_pwonly

authserv/app_main.py

@@ -55,15 +55,16 @@ def api_auth():
 
 @app.route('/api/1/auth_pwonly', methods=('POST',))
 def api_auth_pwonly():
+    service = request.form.get('service')
     username = request.form.get('username')
     password = request.form.get('password')
 
-    if not username:
+    if not service or not username:
         abort(400)
 
     try:
         auth_status, errmsg, unused_shard = do_auth(
-            username, None, None, password, None, None,
+            username, service, None, password, None, None,
             password_only=True)
     except Exception, e:
         app.logger.exception('Unexpected exception in auth_pwonly()')

authserv/test/test_app_main.py

@@ -223,6 +223,7 @@ class ServerTest(unittest.TestCase):
         response = self.app.post(
             URL_PWONLY, data={
                 'username': 'user',
+                'service': 'svc',
                 'password': 'pass'})
         self.assertEquals(protocol.OK, response.data)
 
@@ -230,6 +231,7 @@ class ServerTest(unittest.TestCase):
         response = self.app.post(
             URL_PWONLY, data={
                 'username': 'otpuser',
+                'service': 'svc',
                 'password': 'pass'})
         self.assertEquals(protocol.OK, response.data)
 
@@ -237,6 +239,7 @@ class ServerTest(unittest.TestCase):
         response = self.app.post(
             URL_PWONLY, data={
                 'username': 'user',
+                'service': 'svc',
                 'password': 'badpass'})
         self.assertEquals(protocol.ERR_AUTHENTICATION_FAILURE,
                           response.data)