Ticket #635: httpauth.patch

Classes/BlogDataManager.m

@@ -5137 +5137 @@
         //call the keychain util's getPassword function, passing in the userName and blogURL we got from the method that called this one
         // and set our blank string equal to the result of this call
         NSError *anError = nil;
+        blogURL = [blogURL stringByReplacingOccurrencesOfString:@"https://" withString:@""];
         keychainPWD = [SFHFKeychainUtils getPasswordForUsername : userName andServiceName : blogURL error:&anError];
         //return the resulting string to the calling function as a string
         //NSLog(@"Inside getBlogPasswordFromKeychainWithUsername... keychainPWD is %@", keychainPWD);

Classes/AddSiteViewController.m

@@ -522 +522 @@
                         // Grab our XML-RPC url
                         ASIHTTPRequest *htmlRequest = [[ASIHTTPRequest alloc] initWithURL:[NSURL URLWithString:url]];
                         [htmlRequest setShouldPresentCredentialsBeforeChallenge:NO];
+                        [htmlRequest setValidatesSecureCertificate:NO];
                         [htmlRequest setShouldPresentAuthenticationDialog:YES];
                         [htmlRequest setUseKeychainPersistence:YES];
                         [htmlRequest setDelegate:self];
@@ -742 +743 @@
                                                                                                                  andBlogURL:[self.url stringByReplacingOccurrencesOfRegex:@"http(s?)://" withString:@""]];
         
         if([authEnabled isEqualToNumber:[NSNumber numberWithInt:1]]) {
-                [[BlogDataManager sharedDataManager] updatePasswordInKeychain:authPassword
+                [[BlogDataManager sharedDataManager] saveBlogPasswordToKeychain:authPassword
                                                                                                                   andUserName:authUsername
                                                                                                                    andBlogURL:authBlogURL];
         }

Classes/WPMediaUploader.h

@@ -20 +20 @@
         UILabel *messageLabel;
         UIProgressView *progressView;
     UIButton *stopButton;
+        BlogDataManager *dm;
         
         MediaType mediaType;
         MediaOrientation orientation;

Classes/WPMediaUploader.m

@@ -148 +148 @@
         else if(self.mediaType == kVideo)
                 [self updateStatus:@"Uploading video..."];
         
+        
+        dm = [BlogDataManager sharedDataManager];
+        BOOL httpAuthEnabled = [[dm.currentBlog objectForKey:@"authEnabled"] boolValue];
+        NSString *httpAuthUsername = [dm.currentBlog valueForKey:@"authUsername"];
+        NSString *httpAuthPassword = [dm getHTTPPasswordFromKeychainInContextOfCurrentBlog:dm.currentBlog];
+        
         ASIFormDataRequest *request = [ASIFormDataRequest requestWithURL:[NSURL URLWithString:self.xmlrpcURL]];
         [request setDelegate:self];
         [request setShouldStreamPostDataFromDisk:YES];
         [request appendPostDataFromFile:self.localEncodedURL];
         [request setUploadProgressDelegate:self.progressView];
         [request setTimeOutSeconds:600];
+        [request setValidatesSecureCertificate:NO];
+        if (httpAuthEnabled) {
+                [request setUsername:httpAuthUsername];
+                [request setPassword:httpAuthPassword];
+        }
         [request startAsynchronous];
 }
 
@@ -473 +484 @@
 
 - (void)connection:(NSURLConnection *)conn didFailWithError:(NSError *)error {
         [self updateStatus:@"Upload failed. Please try again."];
-        NSLog(@"connection failed: %@", [error localizedDescription]);
+        NSLog(@"connection failed: %@", [error localizedDescription]);  
         
         if(self.mediaType == kImage)
                 [self stopWithNotificationName:@"ImageUploadFailed"];