Chromium Code Reviews| Index: chrome/browser/policy/test/policy_testserver.py |
| diff --git a/chrome/browser/policy/test/policy_testserver.py b/chrome/browser/policy/test/policy_testserver.py |
| index 316d855de6ceb6784937dd47d4f7f6816e0420e4..855ea22ce36aae1b04715068edc221814435b5fd 100644 |
| --- a/chrome/browser/policy/test/policy_testserver.py |
| +++ b/chrome/browser/policy/test/policy_testserver.py |
| @@ -290,7 +290,8 @@ class PolicyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): |
| # device_management_backend.proto. |
| if (self.GetUniqueParam('devicetype') != '2' or |
| self.GetUniqueParam('apptype') != 'Chrome' or |
| - len(self.GetUniqueParam('deviceid')) >= 64): |
| + (self.GetUniqueParam('deviceid') is not None and |
| + len(self.GetUniqueParam('deviceid')) >= 64)): |
| return (400, 'Invalid request parameter') |
| if request_type == 'register': |
| response = self.ProcessRegister(rmsg.register_request) |
| @@ -314,6 +315,10 @@ class PolicyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): |
| response = self.ProcessDeviceAttributeUpdateRequest() |
| elif request_type == 'remote_commands': |
| response = self.ProcessRemoteCommandsRequest() |
| + elif request_type == 'check_android_management': |
| + response = self.ProcessCheckAndroidManagementRequest( |
| + rmsg.check_android_management_request, |
| + str(self.GetUniqueParam('oauth_token'))) |
| else: |
| return (400, 'Invalid request parameter') |
| @@ -624,6 +629,24 @@ class PolicyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): |
| """ |
| return (200, '') |
| + def ProcessCheckAndroidManagementRequest(self, msg, oauth_token): |
| + """Handles a check android management request. |
|
bartfab (slow)
2016/05/02 14:55:49
Nit: s/android/Android/
Polina Bondarenko
2016/05/03 13:41:55
Done.
|
| + |
| + Returns: |
| + A tuple of HTTP status code and response data to send to the client. |
| + """ |
| + check_android_management_response = dm.CheckAndroidManagementResponse() |
| + |
| + response = dm.DeviceManagementResponse() |
| + response.check_android_management_response.CopyFrom( |
| + check_android_management_response) |
| + if oauth_token == 'managed-auth-token': |
| + return (409, response) |
| + elif oauth_token == 'unmanaged-auth-token': |
| + return (200, response) |
| + else: |
| + return (403, response) |
| + |
| def SetProtobufMessageField(self, group_message, field, field_value): |
| """Sets a field in a protobuf message. |