Add support for Android and iOS policy fetch types to the testserver.

BUG=None

Review URL: https://codereview.chromium.org/132033002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244211 0039d316-1c4b-4281-b951-d872f2087c98
parent ba2d79d6
...@@ -364,11 +364,13 @@ class PolicyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): ...@@ -364,11 +364,13 @@ class PolicyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
for request in msg.request: for request in msg.request:
fetch_response = response.policy_response.response.add() fetch_response = response.policy_response.response.add()
if (request.policy_type in if (request.policy_type in
('google/chrome/user', ('google/android/user',
'google/chromeos/user', 'google/chrome/extension',
'google/chromeos/device', 'google/chromeos/device',
'google/chromeos/publicaccount', 'google/chromeos/publicaccount',
'google/chrome/extension')): 'google/chromeos/user',
'google/chrome/user',
'google/ios/user')):
if request_type != 'policy': if request_type != 'policy':
fetch_response.error_code = 400 fetch_response.error_code = 400
fetch_response.error_message = 'Invalid request type' fetch_response.error_message = 'Invalid request type'
...@@ -543,9 +545,11 @@ class PolicyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): ...@@ -543,9 +545,11 @@ class PolicyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
if msg.settings_entity_id: if msg.settings_entity_id:
policy_key += '/' + msg.settings_entity_id policy_key += '/' + msg.settings_entity_id
if msg.policy_type in token_info['allowed_policy_types']: if msg.policy_type in token_info['allowed_policy_types']:
if (msg.policy_type == 'google/chromeos/user' or if msg.policy_type in ('google/android/user',
msg.policy_type == 'google/chrome/user' or 'google/chromeos/publicaccount',
msg.policy_type == 'google/chromeos/publicaccount'): 'google/chromeos/user',
'google/chrome/user',
'google/ios/user'):
settings = cp.CloudPolicySettings() settings = cp.CloudPolicySettings()
payload = self.server.ReadPolicyFromDataDir(policy_key, settings) payload = self.server.ReadPolicyFromDataDir(policy_key, settings)
if payload is None: if payload is None:
...@@ -777,6 +781,12 @@ class PolicyTestServer(testserver_base.BrokenPipeHandlerMixIn, ...@@ -777,6 +781,12 @@ class PolicyTestServer(testserver_base.BrokenPipeHandlerMixIn,
'google/chromeos/device', 'google/chromeos/device',
'google/chromeos/publicaccount' 'google/chromeos/publicaccount'
], ],
dm.DeviceRegisterRequest.ANDROID_BROWSER: [
'google/android/user'
],
dm.DeviceRegisterRequest.IOS_BROWSER: [
'google/ios/user'
],
dm.DeviceRegisterRequest.TT: ['google/chromeos/user', dm.DeviceRegisterRequest.TT: ['google/chromeos/user',
'google/chrome/user'], 'google/chrome/user'],
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment