mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Resolved conflicts with Chris's changes (to use the username, unhashed, as the name of the server-side sharing directory)

This commit is contained in:
jonathandicarlo@jonathan-dicarlos-macbook-pro.local 2008-06-06 17:43:15 -07:00
Родитель 11f8af5431 32b49e6b82
Коммит e09c7116a8
13 изменённых файлов: 40 добавлений и 30 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
services/crypto/Makefile
Просмотреть файл

@ -162,6 +162,8 @@ else
ldflags += -pthread -pipe -DMOZILLA_STRICT_API \ ldflags += -pthread -pipe -DMOZILLA_STRICT_API \
-Wl,-dead_strip \ -Wl,-dead_strip \
-Wl,-exported_symbol \ -Wl,-exported_symbol \
-Wl,-z,defs -Wl,-h,WeaveCrypto.so \
-Wl,-rpath-link,$(sdkdir)/bin \
$(sdkdir)/lib/libxpcomglue_s.a \ $(sdkdir)/lib/libxpcomglue_s.a \
$(libdirs) $(libs) $(libdirs) $(libs)
else else
@ -213,6 +215,10 @@ $(idl_typelib): $(idl)
$(cpp_objects): $(cpp_sources) $(cpp_objects): $(cpp_sources)
ifeq ($(cxx),cl) ifeq ($(cxx),cl)
$(cxx) -Fo$@ -Fd$(@:.o=.pdb) $(cppflags) $(@:.o=.cpp) $(cxx) -Fo$@ -Fd$(@:.o=.pdb) $(cppflags) $(@:.o=.cpp)
endif
ifeq ($(os),Linux)
# don't need object files, but we need to satisfy make
touch $(cpp_objects)
else else
$(cxx) -o $@ $(cppflags) $(@:.o=.cpp) $(cxx) -o $@ $(cppflags) $(@:.o=.cpp)
endif endif
@ -226,7 +232,7 @@ $(so_target): $(idl_headers) $(cpp_objects) $(target:=.res)
else else
ifeq ($(os),Linux) ifeq ($(os),Linux)
$(so_target): $(idl_headers) $(cpp_objects) $(so_target): $(idl_headers) $(cpp_objects)
$(cxx) -o $@ $(cppflags) $(ldflags) $(cpp_sources) $(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
else else
$(so_target): $(idl_headers) $(cpp_objects) $(so_target): $(idl_headers) $(cpp_objects)
$(cxx) -o $@ $(ldflags) $(cpp_objects) $(cxx) -o $@ $(ldflags) $(cpp_objects)

4
services/sync/locales/en-US/login.dtd
Просмотреть файл

@ -1,6 +1,6 @@
<!ENTITY dialog.title "Mozilla Services Login"> <!ENTITY dialog.title "Mozilla Labs - Weave Login">
<!ENTITY dialog.label "Sign in to Weave from this computer."> <!ENTITY dialog.label "Sign in to Weave from this computer.">
<!ENTITY username.label "Email:"> <!ENTITY username.label "Weave ID:">
<!ENTITY password.label "Password:"> <!ENTITY password.label "Password:">
<!ENTITY encryptionPassphrase.label "Encryption Passphrase:"> <!ENTITY encryptionPassphrase.label "Encryption Passphrase:">
<!ENTITY savePassword.label "Save password on this computer"> <!ENTITY savePassword.label "Save password on this computer">

6
services/sync/locales/en-US/preferences.dtd
Просмотреть файл

@ -20,11 +20,15 @@
<!ENTITY syncNowButton.label "Sync Now"> <!ENTITY syncNowButton.label "Sync Now">
<!ENTITY syncItemsList.label "Synchronize these items:"> <!ENTITY syncItemsList.label "Synchronize these items:">
<!ENTITY bookmarksCheckbox.label "Bookmarks"> <!ENTITY bookmarksCheckbox.label "Bookmarks">
<!ENTITY historyCheckbox.label "History"> <!ENTITY historyCheckbox.label "Browsing History">
<!ENTITY cookiesCheckbox.label "Cookies"> <!ENTITY cookiesCheckbox.label "Cookies">
<!ENTITY passwordsCheckbox.label "Saved Passwords"> <!ENTITY passwordsCheckbox.label "Saved Passwords">
<!ENTITY formsCheckbox.label "Saved Form Data"> <!ENTITY formsCheckbox.label "Saved Form Data">
<!ENTITY tabsCheckbox.label "Tabs"> <!ENTITY tabsCheckbox.label "Tabs">
<!ENTITY extensionsCheckbox.label "Extensions">
<!ENTITY themesCheckbox.label "Themes">
<!ENTITY pluginsCheckbox.label "Search Plugins">
<!ENTITY microformatsCheckbox.label "Microformats">
<!ENTITY addonsGroupbox.description "This is where you will find, install, and manage Weave add-ons."> <!ENTITY addonsGroupbox.description "This is where you will find, install, and manage Weave add-ons.">

4
services/sync/locales/en-US/share.dtd
Просмотреть файл

@ -1,6 +1,6 @@
<!ENTITY dialog.title "Weave Sharing"> <!ENTITY dialog.title "Weave Sharing">
<!ENTITY close.button.label "Close"> <!ENTITY close.button.label "Close">
<!ENTITY share.button.label "Share"> <!ENTITY share.button.label "Share">
<!ENTITY description.top "Enter the ID of the user you wish to share your bookmarks with:"> <!ENTITY description.top "Enter the Weave ID of the user you wish to share your bookmarks with:">
<!ENTITY username.label "Weave ID (Email):"> <!ENTITY username.label "Weave ID:">
<!ENTITY status.waiting "Waiting..."> <!ENTITY status.waiting "Waiting...">

3
services/sync/locales/en-US/sync.dtd
Просмотреть файл

@ -2,8 +2,7 @@
<!ENTITY logInItem.label "Sign In..."> <!ENTITY logInItem.label "Sign In...">
<!ENTITY logOutItem.label "Sign Out"> <!ENTITY logOutItem.label "Sign Out">
<!ENTITY syncNowItem.label "Sync Now"> <!ENTITY syncNowItem.label "Sync Now">
<!ENTITY shareItem.label "Share Bookmarks..."> <!ENTITY openPrefsItem.label "Preferences...">
<!ENTITY openPrefsItem.label "Weave Preferences...">
<!ENTITY openLogItem.label "Activity Log..."> <!ENTITY openLogItem.label "Activity Log...">
<!ENTITY status.offline.label "Offline"> <!ENTITY status.offline.label "Offline">

2
services/sync/locales/en-US/wizard.dtd
Просмотреть файл

@ -16,7 +16,7 @@
<!ENTITY step3.counter "Step 3 of 5"> <!ENTITY step3.counter "Step 3 of 5">
<!ENTITY step3.title "Account Details"> <!ENTITY step3.title "Account Details">
<!ENTITY step3.description "Please enter the Weave account details and click the &quot;Verify&quot; button to validate before proceeding."> <!ENTITY step3.description "Please enter the Weave account details and click the &quot;Verify&quot; button to validate before proceeding.">
<!ENTITY username.label "Email:"> <!ENTITY username.label "Weave ID:">
<!ENTITY password.label "Password:"> <!ENTITY password.label "Password:">
<!ENTITY encryptionPassphrase.description "You must also now choose an encryption passphrase that is different from your password. This will be used to protect your data on the server."> <!ENTITY encryptionPassphrase.description "You must also now choose an encryption passphrase that is different from your password. This will be used to protect your data on the server.">
<!ENTITY encryptionPassphrase.label "Encryption Passphrase:"> <!ENTITY encryptionPassphrase.label "Encryption Passphrase:">

2
services/sync/locales/en-US/wizard.properties
Просмотреть файл

@ -10,4 +10,4 @@ initStatusSyncFailed.label = Status: Transfer Failed
invalidCredentials.alert = You must provide a valid Weave user name and password to continue. invalidCredentials.alert = You must provide a valid Weave user name and password to continue.
noPassphrase.alert = You must enter a passphrase noPassphrase.alert = You must enter a passphrase
samePasswordAndPassphrase.alert = Your password and passphrase must be different samePasswordAndPassphrase.alert = Your password and passphrase must be different

2
services/sync/modules/constants.js
Просмотреть файл

@ -42,7 +42,7 @@ const EXPORTED_SYMBOLS = ['WEAVE_VERSION', 'STORAGE_FORMAT_VERSION',
'PERMS_FILE', 'PERMS_PASSFILE', 'PERMS_DIRECTORY', 'PERMS_FILE', 'PERMS_PASSFILE', 'PERMS_DIRECTORY',
'ONE_BYTE', 'ONE_KILOBYTE', 'ONE_MEGABYTE']; 'ONE_BYTE', 'ONE_KILOBYTE', 'ONE_MEGABYTE'];
const WEAVE_VERSION = "0.1.30"; const WEAVE_VERSION = "0.1.31";
const STORAGE_FORMAT_VERSION = 2; const STORAGE_FORMAT_VERSION = 2;
const ENGINE_STORAGE_FORMAT_VERSION = 2; const ENGINE_STORAGE_FORMAT_VERSION = 2;

2
services/sync/modules/engines.js
Просмотреть файл

@ -413,7 +413,7 @@ Engine.prototype = {
this._log.error("Could not upload files to server"); // eep? this._log.error("Could not upload files to server"); // eep?
} else { } else {
this._remote.deltas.put(self.cb, this._serializeCommands(server.deltas)); this._remote.deltas.put(self.cb, server.deltas);
yield; yield;
let c = 0; let c = 0;

2
services/sync/modules/engines/tabs.js
Просмотреть файл

@ -207,7 +207,7 @@ TabStore.prototype = {
_init: function TabStore__init() { _init: function TabStore__init() {
this._restoreVirtualTabs(); this._restoreVirtualTabs();
this.__proto__.__proto__._init(); this.__proto__.__proto__._init.call(this);
}, },
/** /**

16
services/sync/modules/remote.js
Просмотреть файл

@ -260,13 +260,13 @@ JsonFilter.prototype = {
beforePUT: function JsonFilter_beforePUT(data) { beforePUT: function JsonFilter_beforePUT(data) {
let self = yield; let self = yield;
this._log.debug("Encoding data as JSON") this._log.debug("Encoding data as JSON");
self.done(this._json.encode(data)); self.done(this._json.encode(data));
}, },
afterGET: function JsonFilter_afterGET(data) { afterGET: function JsonFilter_afterGET(data) {
let self = yield; let self = yield;
this._log.debug("Decoding JSON data") this._log.debug("Decoding JSON data");
self.done(this._json.decode(data)); self.done(this._json.decode(data));
} }
}; };
@ -281,7 +281,7 @@ CryptoFilter.prototype = {
beforePUT: function CryptoFilter_beforePUT(data) { beforePUT: function CryptoFilter_beforePUT(data) {
let self = yield; let self = yield;
this._log.debug("Encrypting data") this._log.debug("Encrypting data");
Crypto.PBEencrypt.async(Crypto, self.cb, data, ID.get(this._remote.cryptoId)); Crypto.PBEencrypt.async(Crypto, self.cb, data, ID.get(this._remote.cryptoId));
let ret = yield; let ret = yield;
self.done(ret); self.done(ret);
@ -289,7 +289,7 @@ CryptoFilter.prototype = {
afterGET: function CryptoFilter_afterGET(data) { afterGET: function CryptoFilter_afterGET(data) {
let self = yield; let self = yield;
this._log.debug("Decrypting data") this._log.debug("Decrypting data");
if (!this._remote.status.data) if (!this._remote.status.data)
throw "Remote status must be initialized before crypto filter can be used" throw "Remote status must be initialized before crypto filter can be used"
let alg = this._remote.status.data[this._algProp]; let alg = this._remote.status.data[this._algProp];
@ -306,7 +306,7 @@ Status.prototype = {
__proto__: new Resource(), __proto__: new Resource(),
_init: function Status__init(remoteStore) { _init: function Status__init(remoteStore) {
this._remote = remoteStore; this._remote = remoteStore;
this.__proto__.__proto__._init(this._remote.serverPrefix + "status.json"); this.__proto__.__proto__._init.call(this, this._remote.serverPrefix + "status.json");
this.pushFilter(new JsonFilter()); this.pushFilter(new JsonFilter());
} }
}; };
@ -318,7 +318,7 @@ Keychain.prototype = {
__proto__: new Resource(), __proto__: new Resource(),
_init: function Keychain__init(remoteStore) { _init: function Keychain__init(remoteStore) {
this._remote = remoteStore; this._remote = remoteStore;
this.__proto__.__proto__._init(this._remote.serverPrefix + "keys.json"); this.__proto__.__proto__._init.call(this, this._remote.serverPrefix + "keys.json");
this.pushFilter(new JsonFilter()); this.pushFilter(new JsonFilter());
}, },
_getKey: function Keychain__getKey(identity) { _getKey: function Keychain__getKey(identity) {
@ -347,7 +347,7 @@ Snapshot.prototype = {
__proto__: new Resource(), __proto__: new Resource(),
_init: function Snapshot__init(remoteStore) { _init: function Snapshot__init(remoteStore) {
this._remote = remoteStore; this._remote = remoteStore;
this.__proto__.__proto__._init(this._remote.serverPrefix + "snapshot.json"); this.__proto__.__proto__._init.call(this, this._remote.serverPrefix + "snapshot.json");
this.pushFilter(new JsonFilter()); this.pushFilter(new JsonFilter());
this.pushFilter(new CryptoFilter(remoteStore, "snapshotEncryption")); this.pushFilter(new CryptoFilter(remoteStore, "snapshotEncryption"));
} }
@ -360,7 +360,7 @@ Deltas.prototype = {
__proto__: new Resource(), __proto__: new Resource(),
_init: function Deltas__init(remoteStore) { _init: function Deltas__init(remoteStore) {
this._remote = remoteStore; this._remote = remoteStore;
this.__proto__.__proto__._init(this._remote.serverPrefix + "deltas.json"); this.__proto__.__proto__._init.call(this, this._remote.serverPrefix + "deltas.json");
this.pushFilter(new JsonFilter()); this.pushFilter(new JsonFilter());
this.pushFilter(new CryptoFilter(remoteStore, "deltasEncryption")); this.pushFilter(new CryptoFilter(remoteStore, "deltasEncryption"));
} }

4
services/sync/modules/service.js
Просмотреть файл

@ -157,7 +157,7 @@ WeaveSvc.prototype = {
get passphrase() { return ID.get('WeaveCryptoID').password; }, get passphrase() { return ID.get('WeaveCryptoID').password; },
set passphrase(value) { ID.get('WeaveCryptoID').password = value; }, set passphrase(value) { ID.get('WeaveCryptoID').password = value; },
get userPath() { return ID.get('WeaveID').userHash; }, get userPath() { return ID.get('WeaveID').username; },
get currentUser() { get currentUser() {
if (this._loggedIn) if (this._loggedIn)
@ -178,7 +178,7 @@ WeaveSvc.prototype = {
onWindowOpened: function Weave__onWindowOpened() { onWindowOpened: function Weave__onWindowOpened() {
if (!this._startupFinished) { if (!this._startupFinished) {
if (Utils.prefs.getBoolPref("autoconnect") && if (Utils.prefs.getBoolPref("autoconnect") &&
this.username && this.username != 'nobody@mozilla.com') { this.username && this.username != 'nobody') {
// Login, then sync. // Login, then sync.
let self = this; let self = this;
this.login(function() { self.sync(); }); this.login(function() { self.sync(); });

15
services/sync/services-sync.js
Просмотреть файл

@ -1,5 +1,5 @@
pref("extensions.weave.serverURL", "https://services.mozilla.com/"); pref("extensions.weave.serverURL", "https://sm-labs01.mozilla.org:81/");
pref("extensions.weave.username", "nobody@mozilla.com"); pref("extensions.weave.username", "nobody");
pref("extensions.weave.encryption", "aes-256-cbc"); pref("extensions.weave.encryption", "aes-256-cbc");
@ -7,17 +7,18 @@ pref("extensions.weave.lastversion", "firstrun");
pref("extensions.weave.lastsync", "0"); pref("extensions.weave.lastsync", "0");
pref("extensions.weave.ui.syncnow", true); pref("extensions.weave.ui.syncnow", true);
pref("extensions.weave.ui.sharebookmarks", false); pref("extensions.weave.ui.sharebookmarks", true);
pref("extensions.weave.rememberpassword", true); pref("extensions.weave.rememberpassword", true);
pref("extensions.weave.autoconnect", true); pref("extensions.weave.autoconnect", true);
pref("extensions.weave.enabled", true); pref("extensions.weave.enabled", true);
pref("extensions.weave.schedule", 1); pref("extensions.weave.schedule", 1);
pref("extensions.weave.engine.bookmarks", true); pref("extensions.weave.engine.bookmarks", true);
pref("extensions.weave.engine.history", true); pref("extensions.weave.engine.history", true);
pref("extensions.weave.engine.cookies", false ); pref("extensions.weave.engine.cookies", true );
pref("extensions.weave.engine.passwords", false ); pref("extensions.weave.engine.passwords", true );
pref("extensions.weave.engine.forms", false ); pref("extensions.weave.engine.forms", true );
pref("extensions.weave.engine.tabs", false); pref("extensions.weave.engine.tabs", true);
pref("extensions.weave.log.appender.console", "Warn"); pref("extensions.weave.log.appender.console", "Warn");
pref("extensions.weave.log.appender.dump", "Error"); pref("extensions.weave.log.appender.dump", "Error");