diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-17 23:38:30 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-17 23:38:30 +0000 |
| commit | 67192b4b7800af69dda3168877db3d9d4f1f202d (patch) | |
| tree | c5c173386b56d1cbf4e5cc809761a5d463e5eee1 /chrome/browser/sync/engine/syncapi_internal.cc | |
| parent | d3540c23e13dc77e8c89054bcadc7d56eeb497de (diff) | |
| download | chromium_src-67192b4b7800af69dda3168877db3d9d4f1f202d.zip chromium_src-67192b4b7800af69dda3168877db3d9d4f1f202d.tar.gz chromium_src-67192b4b7800af69dda3168877db3d9d4f1f202d.tar.bz2 | |
Original patch by rlarocque@chromium.org at http://codereview.chromium.org/7633077/
Fragment syncapi.h into sync/internal_api/*
This commit splits syncapi.cc and syncapi.h into many files. Most of these files have been moved to the newly created chrome/browser/sync/internal_api.
Each of the following classes now have their own .cc and .h files:
- BaseNode
- ReadNode
- WriteNode
- BaseTransaction
- ReadTransaction
- WriteTransaction
- UserShare
- SyncManager
Functions formerly declared at file-scope in syncapi.cc and shared among several classes are now declared in engine/syncapi_internal.h. We intend to use DEPS rules to prevent these functions from being included in non-syncapi classes.
Test classes closely related to syncapi.h classes have been moved from engine to internal_api.
This change necessarily touches the #include lists for lots of files and some of the sources lists in .gyp.
This change should have no effect on program behaviour.
BUG=19878
TEST=
Review URL: http://codereview.chromium.org/7624009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine/syncapi_internal.cc')
| -rw-r--r-- | chrome/browser/sync/engine/syncapi_internal.cc | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/chrome/browser/sync/engine/syncapi_internal.cc b/chrome/browser/sync/engine/syncapi_internal.cc new file mode 100644 index 0000000..aeb97fc --- /dev/null +++ b/chrome/browser/sync/engine/syncapi_internal.cc @@ -0,0 +1,78 @@ +// 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. + +#include "chrome/browser/sync/engine/syncapi_internal.h" + +#include "base/memory/scoped_ptr.h" +#include "chrome/browser/sync/util/cryptographer.h" +#include "chrome/browser/sync/protocol/password_specifics.pb.h" + +using browser_sync::Cryptographer; + +namespace sync_api { + +sync_pb::PasswordSpecificsData* DecryptPasswordSpecifics( + const sync_pb::EntitySpecifics& specifics, Cryptographer* crypto) { + if (!specifics.HasExtension(sync_pb::password)) + return NULL; + const sync_pb::PasswordSpecifics& password_specifics = + specifics.GetExtension(sync_pb::password); + if (!password_specifics.has_encrypted()) + return NULL; + const sync_pb::EncryptedData& encrypted = password_specifics.encrypted(); + scoped_ptr<sync_pb::PasswordSpecificsData> data( + new sync_pb::PasswordSpecificsData); + if (!crypto->Decrypt(encrypted, data.get())) + return NULL; + return data.release(); +} + +// The list of names which are reserved for use by the server. +static const char* kForbiddenServerNames[] = { "", ".", ".." }; + +// Checks whether |name| is a server-illegal name followed by zero or more space +// characters. The three server-illegal names are the empty string, dot, and +// dot-dot. Very long names (>255 bytes in UTF-8 Normalization Form C) are +// also illegal, but are not considered here. +bool IsNameServerIllegalAfterTrimming(const std::string& name) { + size_t untrimmed_count = name.find_last_not_of(' ') + 1; + for (size_t i = 0; i < arraysize(kForbiddenServerNames); ++i) { + if (name.compare(0, untrimmed_count, kForbiddenServerNames[i]) == 0) + return true; + } + return false; +} + +// Compare the values of two EntitySpecifics, accounting for encryption. +bool AreSpecificsEqual(const browser_sync::Cryptographer* cryptographer, + const sync_pb::EntitySpecifics& left, + const sync_pb::EntitySpecifics& right) { + // Note that we can't compare encrypted strings directly as they are seeded + // with a random value. + std::string left_plaintext, right_plaintext; + if (left.has_encrypted()) { + if (!cryptographer->CanDecrypt(left.encrypted())) { + NOTREACHED() << "Attempting to compare undecryptable data."; + return false; + } + left_plaintext = cryptographer->DecryptToString(left.encrypted()); + } else { + left_plaintext = left.SerializeAsString(); + } + if (right.has_encrypted()) { + if (!cryptographer->CanDecrypt(right.encrypted())) { + NOTREACHED() << "Attempting to compare undecryptable data."; + return false; + } + right_plaintext = cryptographer->DecryptToString(right.encrypted()); + } else { + right_plaintext = right.SerializeAsString(); + } + if (left_plaintext == right_plaintext) { + return true; + } + return false; +} + +} // namespace sync_api |
