Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Unified Diff: chrome/browser/importer/firefox_importer_utils.cc

Issue 159165: Split NSSDecryptor out into platform specific files.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/importer/firefox_importer_utils.cc
===================================================================
--- chrome/browser/importer/firefox_importer_utils.cc (revision 21221)
+++ chrome/browser/importer/firefox_importer_utils.cc (working copy)
@@ -9,17 +9,12 @@
#include "base/file_util.h"
#include "base/logging.h"
#include "base/string_util.h"
-#include "base/sys_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/search_engines/template_url_model.h"
#include "chrome/browser/search_engines/template_url_parser.h"
#include "googleurl/src/gurl.h"
-#include "net/base/base64.h"
-#include "webkit/glue/password_form.h"
-using webkit_glue::PasswordForm;
-
namespace {
// FirefoxURLParameterFilter is used to remove parameter mentioning Firefox from
@@ -335,298 +330,3 @@
return false;
}
-
-// class NSSDecryptor.
-
-NSSDecryptor::NSSDecryptor()
- : NSS_Init(NULL), NSS_Shutdown(NULL), PK11_GetInternalKeySlot(NULL),
- PK11_CheckUserPassword(NULL), PK11_FreeSlot(NULL),
- PK11_Authenticate(NULL), PK11SDR_Decrypt(NULL), SECITEM_FreeItem(NULL),
- PL_ArenaFinish(NULL), PR_Cleanup(NULL),
- nss3_dll_(NULL), softokn3_dll_(NULL),
- is_nss_initialized_(false) {
-}
-
-NSSDecryptor::~NSSDecryptor() {
- Free();
-}
-
-bool NSSDecryptor::InitNSS(const std::wstring& db_path,
- base::NativeLibrary plds4_dll,
- base::NativeLibrary nspr4_dll) {
- // NSPR DLLs are already loaded now.
- if (plds4_dll == NULL || nspr4_dll == NULL) {
- Free();
- return false;
- }
-
- // Gets the function address.
- NSS_Init = (NSSInitFunc)
- base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "NSS_Init");
- NSS_Shutdown = (NSSShutdownFunc)
- base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "NSS_Shutdown");
- PK11_GetInternalKeySlot = (PK11GetInternalKeySlotFunc)
- base::GetFunctionPointerFromNativeLibrary(nss3_dll_,
- "PK11_GetInternalKeySlot");
- PK11_FreeSlot = (PK11FreeSlotFunc)
- base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "PK11_FreeSlot");
- PK11_Authenticate = (PK11AuthenticateFunc)
- base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "PK11_Authenticate");
- PK11SDR_Decrypt = (PK11SDRDecryptFunc)
- base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "PK11SDR_Decrypt");
- SECITEM_FreeItem = (SECITEMFreeItemFunc)
- base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "SECITEM_FreeItem");
- PL_ArenaFinish = (PLArenaFinishFunc)
- base::GetFunctionPointerFromNativeLibrary(plds4_dll, "PL_ArenaFinish");
- PR_Cleanup = (PRCleanupFunc)
- base::GetFunctionPointerFromNativeLibrary(nspr4_dll, "PR_Cleanup");
-
- if (NSS_Init == NULL || NSS_Shutdown == NULL ||
- PK11_GetInternalKeySlot == NULL || PK11_FreeSlot == NULL ||
- PK11_Authenticate == NULL || PK11SDR_Decrypt == NULL ||
- SECITEM_FreeItem == NULL || PL_ArenaFinish == NULL ||
- PR_Cleanup == NULL) {
- Free();
- return false;
- }
-
- SECStatus result = NSS_Init(base::SysWideToNativeMB(db_path).c_str());
- if (result != SECSuccess) {
- Free();
- return false;
- }
-
- is_nss_initialized_ = true;
- return true;
-}
-
-void NSSDecryptor::Free() {
- if (is_nss_initialized_) {
- NSS_Shutdown();
- PL_ArenaFinish();
- PR_Cleanup();
- is_nss_initialized_ = false;
- }
- if (softokn3_dll_ != NULL)
- base::UnloadNativeLibrary(softokn3_dll_);
- if (nss3_dll_ != NULL)
- base::UnloadNativeLibrary(nss3_dll_);
- NSS_Init = NULL;
- NSS_Shutdown = NULL;
- PK11_GetInternalKeySlot = NULL;
- PK11_FreeSlot = NULL;
- PK11_Authenticate = NULL;
- PK11SDR_Decrypt = NULL;
- SECITEM_FreeItem = NULL;
- PL_ArenaFinish = NULL;
- PR_Cleanup = NULL;
- nss3_dll_ = NULL;
- softokn3_dll_ = NULL;
-}
-
-// This method is based on some Firefox code in
-// security/manager/ssl/src/nsSDR.cpp
-// The license block is:
-
-/* ***** BEGIN LICENSE BLOCK *****
-* Version: MPL 1.1/GPL 2.0/LGPL 2.1
-*
-* The contents of this file are subject to the Mozilla Public License Version
-* 1.1 (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-* http://www.mozilla.org/MPL/
-*
-* Software distributed under the License is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-* for the specific language governing rights and limitations under the
-* License.
-*
-* The Original Code is the Netscape security libraries.
-*
-* The Initial Developer of the Original Code is
-* Netscape Communications Corporation.
-* Portions created by the Initial Developer are Copyright (C) 1994-2000
-* the Initial Developer. All Rights Reserved.
-*
-* Contributor(s):
-*
-* Alternatively, the contents of this file may be used under the terms of
-* either the GNU General Public License Version 2 or later (the "GPL"), or
-* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-* in which case the provisions of the GPL or the LGPL are applicable instead
-* of those above. If you wish to allow use of your version of this file only
-* under the terms of either the GPL or the LGPL, and not to allow others to
-* use your version of this file under the terms of the MPL, indicate your
-* decision by deleting the provisions above and replace them with the notice
-* and other provisions required by the GPL or the LGPL. If you do not delete
-* the provisions above, a recipient may use your version of this file under
-* the terms of any one of the MPL, the GPL or the LGPL.
-*
-* ***** END LICENSE BLOCK ***** */
-
-std::wstring NSSDecryptor::Decrypt(const std::string& crypt) const {
- // Do nothing if NSS is not loaded.
- if (!nss3_dll_)
- return std::wstring();
-
- // The old style password is encoded in base64. They are identified
- // by a leading '~'. Otherwise, we should decrypt the text.
- std::string plain;
- if (crypt[0] != '~') {
- std::string decoded_data;
- net::Base64Decode(crypt, &decoded_data);
- PK11SlotInfo* slot = NULL;
- slot = PK11_GetInternalKeySlot();
- SECStatus result = PK11_Authenticate(slot, PR_TRUE, NULL);
- if (result != SECSuccess) {
- PK11_FreeSlot(slot);
- return std::wstring();
- }
-
- SECItem request;
- request.data = reinterpret_cast<unsigned char*>(
- const_cast<char*>(decoded_data.data()));
- request.len = static_cast<unsigned int>(decoded_data.size());
- SECItem reply;
- reply.data = NULL;
- reply.len = 0;
- result = PK11SDR_Decrypt(&request, &reply, NULL);
- if (result == SECSuccess)
- plain.assign(reinterpret_cast<char*>(reply.data), reply.len);
-
- SECITEM_FreeItem(&reply, PR_FALSE);
- PK11_FreeSlot(slot);
- } else {
- // Deletes the leading '~' before decoding.
- net::Base64Decode(crypt.substr(1), &plain);
- }
-
- return UTF8ToWide(plain);
-}
-
-// There are three versions of password filess. They store saved user
-// names and passwords.
-// References:
-// http://kb.mozillazine.org/Signons.txt
-// http://kb.mozillazine.org/Signons2.txt
-// http://kb.mozillazine.org/Signons3.txt
-void NSSDecryptor::ParseSignons(const std::string& content,
- std::vector<PasswordForm>* forms) {
- forms->clear();
-
- // Splits the file content into lines.
- std::vector<std::string> lines;
- SplitString(content, '\n', &lines);
-
- // The first line is the file version. We skip the unknown versions.
- if (lines.empty())
- return;
- int version;
- if (lines[0] == "#2c")
- version = 1;
- else if (lines[0] == "#2d")
- version = 2;
- else if (lines[0] == "#2e")
- version = 3;
- else
- return;
-
- GURL::Replacements rep;
- rep.ClearQuery();
- rep.ClearRef();
- rep.ClearUsername();
- rep.ClearPassword();
-
- // Reads never-saved list. Domains are stored one per line.
- size_t i;
- for (i = 1; i < lines.size() && lines[i].compare(".") != 0; ++i) {
- PasswordForm form;
- form.origin = GURL(lines[i]).ReplaceComponents(rep);
- form.signon_realm = form.origin.GetOrigin().spec();
- form.blacklisted_by_user = true;
- forms->push_back(form);
- }
- ++i;
-
- // Reads saved passwords. The information is stored in blocks
- // seperated by lines that only contain a dot. We find a block
- // by the seperator and parse them one by one.
- while (i < lines.size()) {
- size_t begin = i;
- size_t end = i + 1;
- while (end < lines.size() && lines[end].compare(".") != 0)
- ++end;
- i = end + 1;
-
- // A block has at least five lines.
- if (end - begin < 5)
- continue;
-
- PasswordForm form;
-
- // The first line is the site URL.
- // For HTTP authentication logins, the URL may contain http realm,
- // which will be in bracket:
- // sitename:8080 (realm)
- GURL url;
- std::string realm;
- const char kRealmBracketBegin[] = " (";
- const char kRealmBracketEnd[] = ")";
- if (lines[begin].find(kRealmBracketBegin) != std::string::npos) {
- // In this case, the scheme may not exsit. We assume that the
- // scheme is HTTP.
- if (lines[begin].find("://") == std::string::npos)
- lines[begin] = "http://" + lines[begin];
-
- size_t start = lines[begin].find(kRealmBracketBegin);
- url = GURL(lines[begin].substr(0, start));
-
- start += std::string(kRealmBracketBegin).size();
- size_t end = lines[begin].rfind(kRealmBracketEnd);
- realm = lines[begin].substr(start, end - start);
- } else {
- // Don't have http realm. It is the URL that the following passwords
- // belong to.
- url = GURL(lines[begin]);
- }
- // Skips this block if the URL is not valid.
- if (!url.is_valid())
- continue;
- form.origin = url.ReplaceComponents(rep);
- form.signon_realm = form.origin.GetOrigin().spec();
- if (!realm.empty())
- form.signon_realm += realm;
- form.ssl_valid = form.origin.SchemeIsSecure();
- ++begin;
-
- // There may be multiple username/password pairs for this site.
- // In this case, they are saved in one block without a seperated
- // line (contains a dot).
- while (begin + 4 < end) {
- // The user name.
- form.username_element = UTF8ToWide(lines[begin++]);
- form.username_value = Decrypt(lines[begin++]);
- // The element name has a leading '*'.
- if (lines[begin].at(0) == '*') {
- form.password_element = UTF8ToWide(lines[begin++].substr(1));
- form.password_value = Decrypt(lines[begin++]);
- } else {
- // Maybe the file is bad, we skip to next block.
- break;
- }
- // The action attribute from the form element. This line exists
- // in versin 2 or above.
- if (version >= 2) {
- if (begin < end)
- form.action = GURL(lines[begin]).ReplaceComponents(rep);
- ++begin;
- }
- // Version 3 has an extra line for further use.
- if (version == 3) {
- ++begin;
- }
-
- forms->push_back(form);
- }
- }
-}
« no previous file with comments | « chrome/browser/importer/firefox_importer_utils.h ('k') | chrome/browser/importer/firefox_importer_utils_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698