Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 01:05:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clear list of saved sigons when database timeout occurs, r=pnunn

Browse Source
This commit is contained in:
morse%netscape.com 2000-02-04 03:09:23 +00:00
parent eb18579d03
commit 932abefdf3
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
extensions/wallet/src/singsign.cpp
View File

@ -468,8 +468,8 @@ si_SaveSignonDataLocked(PRBool fullSave);
PUBLIC int
SI_LoadSignonData(PRBool fullLoad);
PRIVATE void
si_RemoveAllSignonData();
PUBLIC void
SI_RemoveAllSignonData();
#ifdef DefaultIsOff
PRIVATE PRBool
@ -530,7 +530,7 @@ si_GetSignonRememberingPref(void) {
*/
if (si_list_invalid) {
/*
* set si_list_invalid to PR_FALSE first because si_RemoveAllSignonData
* set si_list_invalid to PR_FALSE first because SI_RemoveAllSignonData
* calls si_GetSignonRememberingPref
*/
si_list_invalid = PR_FALSE;
@ -1275,8 +1275,8 @@ si_FreeReject(si_Reject * reject);
* Remove all the signons and free everything
*/
PRIVATE void
si_RemoveAllSignonData() {
PUBLIC void
SI_RemoveAllSignonData() {
if (si_PartiallyLoaded) {
/* repeatedly remove first user node of first URL node */
while (si_RemoveUser(NULL, nsAutoString(""), PR_FALSE, PR_TRUE)) {
@ -1747,7 +1747,7 @@ SI_LoadSignonData(PRBool fullLoad) {
#ifdef APPLE_KEYCHAIN
if (KeychainManagerAvailable()) {
si_RemoveAllSignonData();
SI_RemoveAllSignonData();
return si_LoadSignonDataFromKeychain();
}
#endif
@ -1769,12 +1769,12 @@ SI_LoadSignonData(PRBool fullLoad) {
return -1;
}
si_RemoveAllSignonData();
SI_RemoveAllSignonData();
if (fullLoad) {
PRUnichar * message = Wallet_Localize("IncorrectKey_TryAgain?");
if (si_KeyTimedOut()) {
si_RemoveAllSignonData();
SI_RemoveAllSignonData();
}
while (!si_SetKey()) {
if ((Wallet_CancelKey() || Wallet_KeySize() < 0) || !si_ConfirmYN(message)) {
@ -2002,7 +2002,7 @@ si_SaveSignonDataLocked(PRBool fullSave) {
if (fullSave2) {
PRUnichar * message = Wallet_Localize("IncorrectKey_TryAgain?");
if (si_KeyTimedOut()) {
si_RemoveAllSignonData();
SI_RemoveAllSignonData();
}
while (!si_SetKey()) {
if (Wallet_CancelKey() || (Wallet_KeySize() < 0) || !si_ConfirmYN(message)) {

4
extensions/wallet/src/wallet.cpp
View File

@ -1326,11 +1326,14 @@ Wallet_KeySet() {
return keySet;
}
extern void SI_RemoveAllSignonData();
PUBLIC PRBool
Wallet_KeyTimedOut() {
time_t curTime = time(NULL);
if (Wallet_KeySet() && (curTime >= keyExpiresTime)) {
keySet = PR_FALSE;
SI_RemoveAllSignonData();
return PR_TRUE;
}
return PR_FALSE;
@ -2701,6 +2704,7 @@ void WLLT_ChangePassword() {
/* force the user to supply old database key, for security */
wallet_KeyTimeoutImmediately();
SI_RemoveAllSignonData();
/* read in user data using old key */
wallet_Initialize(PR_TRUE);