diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-05 01:19:27 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-05 01:19:27 +0000 |
commit | 5a5fdc08c1ae8fdfce391f1a17c5fbb6097ab280 (patch) | |
tree | 9d596e4c66ad4390611bfd0ab1f4852a41687c55 /remoting/proto | |
parent | e37a725dfeef3effedd02eece32523413bbfae0f (diff) | |
download | chromium_src-5a5fdc08c1ae8fdfce391f1a17c5fbb6097ab280.zip chromium_src-5a5fdc08c1ae8fdfce391f1a17c5fbb6097ab280.tar.gz chromium_src-5a5fdc08c1ae8fdfce391f1a17c5fbb6097ab280.tar.bz2 |
Remove old Authentication code that we don't use or need.
Also removed some auth-related protobufs that we don't currenly use.
BUG=None
TEST=IT2Me still works.
Review URL: http://codereview.chromium.org/8351084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/proto')
-rw-r--r-- | remoting/proto/auth.proto | 63 | ||||
-rw-r--r-- | remoting/proto/chromotocol.gyp | 3 | ||||
-rw-r--r-- | remoting/proto/control.proto | 13 | ||||
-rw-r--r-- | remoting/proto/internal.proto | 4 |
4 files changed, 14 insertions, 69 deletions
diff --git a/remoting/proto/auth.proto b/remoting/proto/auth.proto deleted file mode 100644 index 7b671e2..0000000 --- a/remoting/proto/auth.proto +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Messages related to Client/Host Mutual Authentication and Local Login. - -syntax = "proto2"; - -option optimize_for = LITE_RUNTIME; - -package remoting.protocol; - -// Represents the data used in generating the client auth token during session -// initiation. -message ClientAuthToken { - optional string host_full_jid = 1; - optional string client_full_jid = 2; - - // A short-lived OAuth token identifying the client to the host. - optional string client_oauth_token = 3; -} - -// There can be more challenge types later -enum CredentialType { - PASSWORD = 0; -} - -message LocalLoginCredentials { - optional CredentialType type = 1; - optional string username = 2; - optional bytes credential = 3; -} - -message LocalLoginStatus { - optional bool success = 1; - - // Only populated if success is set to false. - optional int32 tries_remaining = 2 [default = 0]; - optional string error_info = 3; -} - -// Sent from the Host to the Client. This is the first message after -// channels are established. -message LocalLoginProperties { - repeated CredentialType supported_credential_types = 1; - - // Used to generate the bank style anti-phishing image. - // This info is stored only on the host. - optional bytes antiphish_image = 2; - optional bytes antiphish_text = 3; -} - -// Sent from Client to Host. This consists of both the login attempt, -// and any session configuration information. -message BeginSessionRequest { - optional LocalLoginCredentials credentials = 1; -} - -// Sent from Host to Client. Replies with login success, and -// final client configuration. -message BeginSessionResponse { - optional LocalLoginStatus login_status = 1; -} diff --git a/remoting/proto/chromotocol.gyp b/remoting/proto/chromotocol.gyp index a1beb06..49cae1c 100644 --- a/remoting/proto/chromotocol.gyp +++ b/remoting/proto/chromotocol.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2010 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -11,7 +11,6 @@ 'target_name': 'chromotocol_proto_lib', 'type': 'static_library', 'sources': [ - 'auth.proto', 'control.proto', 'event.proto', 'internal.proto', diff --git a/remoting/proto/control.proto b/remoting/proto/control.proto index 1f75bcb..a86ea5e 100644 --- a/remoting/proto/control.proto +++ b/remoting/proto/control.proto @@ -10,4 +10,15 @@ option optimize_for = LITE_RUNTIME; package remoting.protocol; -// Add control messages here. Currently we don't have any. +// BeginSessionDeprecated is sent from host to client when the session +// starts. Legacy clients expect to receive this message at the +// beginning of each session. Current clients ignore it. +// +// TODO(sergeyu): Remove it once all clients are upgraded to the new +// version. +message LocalLoginStatusDeprecated { + optional bool success = 1; +} +message BeginSessionDeprecated { + optional LocalLoginStatusDeprecated login_status = 1; +} diff --git a/remoting/proto/internal.proto b/remoting/proto/internal.proto index 84504ac..90ee147 100644 --- a/remoting/proto/internal.proto +++ b/remoting/proto/internal.proto @@ -7,7 +7,6 @@ syntax = "proto2"; -import "auth.proto"; import "control.proto"; import "event.proto"; @@ -17,8 +16,7 @@ package remoting.protocol; // Represents a message being sent on the control channel. message ControlMessage { - optional BeginSessionRequest begin_session_request = 3; - optional BeginSessionResponse begin_session_response = 4; + optional BeginSessionDeprecated begin_session_deprecated = 4; } // Defines an event message on the event channel. |