Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 syntax = "proto2"; | 5 syntax = "proto2"; |
| 6 | 6 |
| 7 option optimize_for = LITE_RUNTIME; | 7 option optimize_for = LITE_RUNTIME; |
| 8 | 8 |
| 9 package enterprise_management; | 9 package enterprise_management; |
| 10 | 10 |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 195 // Possible values for Chrome OS are: | 195 // Possible values for Chrome OS are: |
| 196 // google/chromeos/device => ChromeDeviceSettingsProto | 196 // google/chromeos/device => ChromeDeviceSettingsProto |
| 197 // google/chromeos/user => ChromeSettingsProto | 197 // google/chromeos/user => ChromeSettingsProto |
| 198 // google/chromeos/publicaccount => ChromeSettingsProto | 198 // google/chromeos/publicaccount => ChromeSettingsProto |
| 199 // google/chrome/extension => ExternalPolicyData | 199 // google/chrome/extension => ExternalPolicyData |
| 200 // google/chromeos/signinextension => ExternalPolicyData | 200 // google/chromeos/signinextension => ExternalPolicyData |
| 201 // google/android/user => ChromeSettingsProto | 201 // google/android/user => ChromeSettingsProto |
| 202 // google/ios/user => ChromeSettingsProto | 202 // google/ios/user => ChromeSettingsProto |
| 203 optional string policy_type = 1; | 203 optional string policy_type = 1; |
| 204 | 204 |
| 205 // This is the last policy timestamp that client received from server. | 205 // This is the last policy timestamp that client received from server. |
|
Thiemo Nagel
2017/04/20 14:02:13
Nit: Please add "Java time".
emaxx
2017/04/20 15:00:46
Acknowledged, though I decided to refer to PolicyD
| |
| 206 optional int64 timestamp = 2; | 206 optional int64 timestamp = 2; |
| 207 | 207 |
| 208 // Tell server what kind of security signature is required. | 208 // Tell server what kind of security signature is required. |
| 209 enum SignatureType { | 209 enum SignatureType { |
| 210 NONE = 0; | 210 NONE = 0; |
| 211 SHA1_RSA = 1; | 211 SHA1_RSA = 1; |
| 212 } | 212 } |
| 213 optional SignatureType signature_type = 3 [default = NONE]; | 213 optional SignatureType signature_type = 3 [default = NONE]; |
| 214 | 214 |
| 215 // The version number of the public key that is currently stored | 215 // The version number of the public key that is currently stored |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 279 // |DEVICE_MODE_DISABLED|. | 279 // |DEVICE_MODE_DISABLED|. |
| 280 optional DisabledState disabled_state = 2; | 280 optional DisabledState disabled_state = 2; |
| 281 } | 281 } |
| 282 | 282 |
| 283 // This message is included in serialized form in PolicyFetchResponse below. It | 283 // This message is included in serialized form in PolicyFetchResponse below. It |
| 284 // may also be signed, with the signature being created for the serialized form. | 284 // may also be signed, with the signature being created for the serialized form. |
| 285 message PolicyData { | 285 message PolicyData { |
| 286 // See PolicyFetchRequest.policy_type. | 286 // See PolicyFetchRequest.policy_type. |
| 287 optional string policy_type = 1; | 287 optional string policy_type = 1; |
| 288 | 288 |
| 289 // [timestamp] is milliseconds since Epoch in UTC timezone. It is | 289 // [timestamp] is milliseconds since Epoch in UTC timezone (Java time). It is |
|
Thiemo Nagel
2017/04/20 14:02:13
Nit: Could you please either re-wrap the whole par
emaxx
2017/04/20 15:00:46
Done.
| |
| 290 // included here so that the time at which the server issued this | 290 // included here so that the time at which the server issued this |
| 291 // response cannot be faked (as protection against replay attacks). | 291 // response cannot be faked (as protection against replay attacks). |
| 292 // It is the timestamp generated by DMServer, NOT the time admin | 292 // It is the timestamp generated by DMServer, NOT the time admin |
| 293 // last updated the policy or anything like that. | 293 // last updated the policy or anything like that. |
| 294 optional int64 timestamp = 2; | 294 optional int64 timestamp = 2; |
| 295 | 295 |
| 296 // The DM token that was used by the client in the HTTP POST header | 296 // The DM token that was used by the client in the HTTP POST header |
| 297 // for authenticating the request. It is included here again so that | 297 // for authenticating the request. It is included here again so that |
| 298 // the client can verify that the response is meant for them (and not | 298 // the client can verify that the response is meant for them (and not |
| 299 // issued by a replay or man-in-the-middle attack). | 299 // issued by a replay or man-in-the-middle attack). |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 530 repeated PolicyFetchRequest request = 3; | 530 repeated PolicyFetchRequest request = 3; |
| 531 } | 531 } |
| 532 | 532 |
| 533 // Response from server to device for reading policies. | 533 // Response from server to device for reading policies. |
| 534 message DevicePolicyResponse { | 534 message DevicePolicyResponse { |
| 535 // The policy fetch response. | 535 // The policy fetch response. |
| 536 repeated PolicyFetchResponse response = 3; | 536 repeated PolicyFetchResponse response = 3; |
| 537 } | 537 } |
| 538 | 538 |
| 539 message TimePeriod { | 539 message TimePeriod { |
| 540 // [timestamp] is milli seconds since Epoch in UTC timezone. | 540 // [timestamp] is milliseconds since Epoch in UTC timezone (Java time). |
| 541 optional int64 start_timestamp = 1; | 541 optional int64 start_timestamp = 1; |
| 542 optional int64 end_timestamp = 2; | 542 optional int64 end_timestamp = 2; |
| 543 } | 543 } |
| 544 | 544 |
| 545 message ActiveTimePeriod { | 545 message ActiveTimePeriod { |
| 546 optional TimePeriod time_period = 1; | 546 optional TimePeriod time_period = 1; |
| 547 | 547 |
| 548 // The active duration during the above time period. | 548 // The active duration during the above time period. |
| 549 // The unit is milli-second. | 549 // The unit is milli-second. |
| 550 optional int32 active_duration = 2; | 550 optional int32 active_duration = 2; |
| 551 } | 551 } |
| 552 | 552 |
| 553 // This captures launch events for one app/extension or other installments. | 553 // This captures launch events for one app/extension or other installments. |
| 554 message InstallableLaunch { | 554 message InstallableLaunch { |
| 555 optional string install_id = 1; | 555 optional string install_id = 1; |
| 556 | 556 |
| 557 // Time duration where this report covers. These are required | 557 // Time duration where this report covers. These are required |
| 558 // and the record will be ignored if not set. | 558 // and the record will be ignored if not set. |
| 559 optional TimePeriod duration = 2; | 559 optional TimePeriod duration = 2; |
| 560 | 560 |
| 561 // Client will send at most 50 timestamps to DM. All the rest | 561 // Client will send at most 50 timestamps to DM. All the rest |
|
Thiemo Nagel
2017/04/20 14:02:13
Nit: Please add "Java time".
emaxx
2017/04/20 15:00:46
I think this message InstallableLaunch is actually
Thiemo Nagel
2017/04/20 16:16:52
I've added it to my CL deleting unused proto field
emaxx
2017/04/20 18:33:22
Thanks!
| |
| 562 // launch activities will be summed into the total count. | 562 // launch activities will be summed into the total count. |
| 563 // We will distribute the count evenly among the time span when | 563 // We will distribute the count evenly among the time span when |
| 564 // doing time based aggregation. | 564 // doing time based aggregation. |
| 565 repeated int64 timestamp = 3; | 565 repeated int64 timestamp = 3; |
| 566 optional int64 total_count = 4; | 566 optional int64 total_count = 4; |
| 567 } | 567 } |
| 568 | 568 |
| 569 // OBSOLETE: Used to report the device location. | 569 // OBSOLETE: Used to report the device location. |
| 570 message OBSOLETE_DeviceLocation { | 570 message OBSOLETE_DeviceLocation { |
| 571 enum ErrorCode { | 571 enum ErrorCode { |
| (...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1092 RESULT_SUCCESS = 2; // The command was successfully executed. | 1092 RESULT_SUCCESS = 2; // The command was successfully executed. |
| 1093 } | 1093 } |
| 1094 | 1094 |
| 1095 // The result of the command. | 1095 // The result of the command. |
| 1096 optional ResultType result = 1; | 1096 optional ResultType result = 1; |
| 1097 | 1097 |
| 1098 // The opaque unique identifier of the command. This value is copied from the | 1098 // The opaque unique identifier of the command. This value is copied from the |
| 1099 // RemoteCommand protobuf that contained the command. | 1099 // RemoteCommand protobuf that contained the command. |
| 1100 optional int64 command_id = 2; | 1100 optional int64 command_id = 2; |
| 1101 | 1101 |
| 1102 // The time at which the command was executed, if the the result is | 1102 // The time at which the command was executed, if the the result is |
|
Thiemo Nagel
2017/04/20 14:02:13
Nit: Please mention "Java time".
emaxx
2017/04/20 15:00:46
I'm afraid this is not applicable in this case. Ac
Thiemo Nagel
2017/04/20 16:16:52
The way I read this, TimeTicks::UnixEpoch() is a w
emaxx
2017/04/20 18:33:22
OK, I searched through the server code and it look
| |
| 1103 // RESULT_SUCCESS. | 1103 // RESULT_SUCCESS. |
| 1104 optional int64 timestamp = 3; | 1104 optional int64 timestamp = 3; |
| 1105 | 1105 |
| 1106 // Extra information sent to server as result of execution, expected to be a | 1106 // Extra information sent to server as result of execution, expected to be a |
| 1107 // JSON string. | 1107 // JSON string. |
| 1108 optional string payload = 4; | 1108 optional string payload = 4; |
| 1109 } | 1109 } |
| 1110 | 1110 |
| 1111 message DeviceRemoteCommandRequest { | 1111 message DeviceRemoteCommandRequest { |
| 1112 // The command ID of the last command received from the server until | 1112 // The command ID of the last command received from the server until |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1483 check_android_management_response = 18; | 1483 check_android_management_response = 18; |
| 1484 | 1484 |
| 1485 // Response to an Active Directory Play user enrollment request. | 1485 // Response to an Active Directory Play user enrollment request. |
| 1486 optional ActiveDirectoryEnrollPlayUserResponse | 1486 optional ActiveDirectoryEnrollPlayUserResponse |
| 1487 active_directory_enroll_play_user_response = 19; | 1487 active_directory_enroll_play_user_response = 19; |
| 1488 | 1488 |
| 1489 // Response to a Play activity request. | 1489 // Response to a Play activity request. |
| 1490 optional ActiveDirectoryPlayActivityResponse | 1490 optional ActiveDirectoryPlayActivityResponse |
| 1491 active_directory_play_activity_response = 20; | 1491 active_directory_play_activity_response = 20; |
| 1492 } | 1492 } |
| OLD | NEW |