Camino only - Bug 354996: Punycode domains when storing them in the keychain. r=josh sr=pink

camino/src/formfill/KeychainService.mm

@@ -971,6 +971,12 @@ KeychainFormSubmitObserver::Notify(nsIDOMHTMLFormElement* formNode, nsIDOMWindow
     if ([keychain isHostInDenyList:host])
       return NS_OK;
 
+    // Get the host in punycode for keychain use.
+    nsCAutoString asciiHostCAString;
+    rv = docURL->GetAsciiHost(asciiHostCAString);
+    NSString* asciiHost = NS_SUCCEEDED(rv) ? [NSString stringWithCString:asciiHostCAString.get()]
+                                           : host;
+
     nsCAutoString schemeCAString;
     docURL->GetScheme(schemeCAString);
     NSString* scheme = [NSString stringWithCString:schemeCAString.get()];
@@ -987,6 +993,8 @@ KeychainFormSubmitObserver::Notify(nsIDOMHTMLFormElement* formNode, nsIDOMWindow
     // Check the cache first, then fall back to a search in case a cached
     // entry expired before the user submitted.
     KeychainItem* keychainEntry = [keychain cachedKeychainEntryForKey:uri];
+    // We weren't using punycode for keychain entries up through 1.5, so try
+    // non-punycode first to favor Camino entries.
     if (!keychainEntry) {
       keychainEntry = [keychain findKeychainEntryForHost:host
                                                     port:port
@@ -994,6 +1002,13 @@ KeychainFormSubmitObserver::Notify(nsIDOMHTMLFormElement* formNode, nsIDOMWindow
                                           securityDomain:nil
                                                   isForm:YES];
     }
+    if (!keychainEntry && ![asciiHost isEqualToString:host]) {
+      keychainEntry = [keychain findKeychainEntryForHost:asciiHost
+                                                    port:port
+                                                  scheme:scheme
+                                          securityDomain:nil
+                                                  isForm:YES];
+    }
     // If there's already an entry in the keychain, check if the username
     // and password match. If not, ask the user what they want to do and replace
     // it as necessary. If there's no entry, ask if they want to remember it
@@ -1030,7 +1045,7 @@ KeychainFormSubmitObserver::Notify(nsIDOMHTMLFormElement* formNode, nsIDOMWindow
         case kSave:
           [keychain storeUsername:username
                          password:password
-                          forHost:host
+                          forHost:asciiHost
                    securityDomain:actionHost
                              port:port
                            scheme:scheme
@@ -1138,17 +1153,33 @@ KeychainFormSubmitObserver::Notify(nsIDOMHTMLFormElement* formNode, nsIDOMWindow
       nsCAutoString hostCAString;
       docURL->GetHost(hostCAString);
       host = [NSString stringWithCString:hostCAString.get()];
+      nsCAutoString asciiHostCAString;
+      docURL->GetAsciiHost(asciiHostCAString);
+      NSString* asciiHost = NS_SUCCEEDED(rv) ? [NSString stringWithCString:asciiHostCAString.get()]
+                                             : host;
       nsCAutoString schemeCAString;
       docURL->GetScheme(schemeCAString);
       NSString* scheme = [NSString stringWithCString:schemeCAString.get()];
       PRInt32 port = -1;
       docURL->GetPort(&port);
 
+      // We weren't using punycode for keychain entries up through 1.5, so try
+      // non-punycode first to favor Camino entries.
       keychainEntry = [keychain findKeychainEntryForHost:host
                                                     port:port
                                                   scheme:scheme
                                           securityDomain:nil
                                                   isForm:YES];
+      // TODO: once a released version checks for punycode, anything found with
+      // the above search (and with a Camino creator code) should be fixed
+      // immediately to have the right host.
+      if (!keychainEntry && ![asciiHost isEqualToString:host]) {
+        keychainEntry = [keychain findKeychainEntryForHost:asciiHost
+                                                      port:port
+                                                    scheme:scheme
+                                            securityDomain:nil
+                                                    isForm:YES];
+      }
     }
     // If we don't have a password for the page, don't bother looking for
     // more forms.