Fix #171 encountered with non-valid SSL certificates

Piwigo · Aug 17, 2017 · 77bb6cd · 77bb6cd
1 parent 9cc5e0a
commit 77bb6cd
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 6 deletions.
diff --git a/piwigo/Albums/Album List/AlbumTableViewCell.m b/piwigo/Albums/Album List/AlbumTableViewCell.m
@@ -16,6 +16,7 @@
 #import "CategoriesData.h"
 #import "MoveCategoryViewController.h"
 #import "NetworkHandler.h"
+#import <AFNetworking/AFImageDownloader.h>
 
 @interface AlbumTableViewCell()
 
@@ -389,8 +390,17 @@ -(void)setupWithAlbumData:(PiwigoAlbumData*)albumData
 						  else
 						  {
                               NSString *URLRequest = [NetworkHandler getURLWithPath:[imageData.MediumPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] asPiwigoRequest:NO withURLParams:nil];
+
+                              // Ensure that SSL certificates won't be rejected
+                              AFSecurityPolicy *policy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
+                              [policy setAllowInvalidCertificates:YES];
+                              [policy setValidatesDomainName:NO];
+
+                              AFImageDownloader *dow = [AFImageDownloader defaultInstance];
+                              [dow.sessionManager setSecurityPolicy:policy];
+
                               [self.backgroundImage setImageWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:URLRequest]]
-                                                  placeholderImage:nil
+                                                  placeholderImage:[UIImage imageNamed:@"placeholder"]
                                                            success:^(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image) {
                                                                albumData.categoryImage = image;
                                                                [weakSelf setupBgWithImage:image];

diff --git a/piwigo/Albums/Album Pictures/AlbumImagesViewController.m b/piwigo/Albums/Album Pictures/AlbumImagesViewController.m
@@ -23,6 +23,8 @@
 #import "LocalAlbumsViewController.h"
 #import "AlbumData.h"
 #import "NetworkHandler.h"
+#import <AFNetworking/AFImageDownloader.h>
+
 
 @interface AlbumImagesViewController () <UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout, ImageDetailDelegate, CategorySortDelegate, CategoryCollectionViewCellDelegate>
 
@@ -350,8 +352,17 @@ -(void)downloadImage
 	UIImageView *dummyView = [UIImageView new];
 	__weak typeof(self) weakSelf = self;
     NSString *URLRequest = [NetworkHandler getURLWithPath:[downloadingImage.ThumbPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] asPiwigoRequest:NO withURLParams:nil];
-	[dummyView setImageWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:URLRequest]]
-					 placeholderImage:nil
+
+    // Ensure that SSL certificates won't be rejected
+    AFSecurityPolicy *policy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
+    [policy setAllowInvalidCertificates:YES];
+    [policy setValidatesDomainName:NO];
+
+    AFImageDownloader *dow = [AFImageDownloader defaultInstance];
+    [dow.sessionManager setSecurityPolicy:policy];
+
+    [dummyView setImageWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:URLRequest]]
+					 placeholderImage:[UIImage imageNamed:@"placeholderImage"]
 							  success:^(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image) {
 								  weakSelf.downloadView.downloadImage = image;
 							  } failure:nil];

diff --git a/piwigo/Albums/Album Pictures/ImageCollectionViewCell.m b/piwigo/Albums/Album Pictures/ImageCollectionViewCell.m
@@ -10,6 +10,7 @@
 #import "PiwigoImageData.h"
 #import "Model.h"
 #import "NetworkHandler.h"
+#import <AFNetworking/AFImageDownloader.h>
 
 @interface ImageCollectionViewCell()
 
@@ -153,6 +154,14 @@ -(void)setupWithImageData:(PiwigoImageData*)imageData
 		return;
 	}
 
+    // Ensure that any SSL certificate won't be rejected
+    AFSecurityPolicy *policy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
+    [policy setAllowInvalidCertificates:YES];
+    [policy setValidatesDomainName:NO];
+
+    AFImageDownloader *dow = [AFImageDownloader defaultInstance];
+    [dow.sessionManager setSecurityPolicy:policy];
+
     // Download the image of the requested resolution (or get it from the cache)
     switch ([Model sharedInstance].defaultThumbnailSize) {
         case kPiwigoImageSizeSquare:

diff --git a/piwigo/Albums/Image Detail/ImageDetailViewController.m b/piwigo/Albums/Image Detail/ImageDetailViewController.m
@@ -17,6 +17,7 @@
 #import "ImageUpload.h"
 #import "ImageScrollView.h"
 #import "AllCategoriesViewController.h"
+#import <AFNetworking/AFImageDownloader.h>
 
 @interface ImageDetailViewController () <UIPageViewControllerDataSource, UIPageViewControllerDelegate, ImagePreviewDelegate>
 
@@ -199,12 +200,22 @@ -(void)downloadImage
 	UIImageView *dummyView = [UIImageView new];
 	__weak typeof(self) weakSelf = self;
     NSString *URLRequest = [NetworkHandler getURLWithPath:[self.imageData.ThumbPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] asPiwigoRequest:NO withURLParams:nil];
+
+    // Ensure that SSL certificates won't be rejected
+    AFSecurityPolicy *policy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
+    [policy setAllowInvalidCertificates:YES];
+    [policy setValidatesDomainName:NO];
+
+    AFImageDownloader *dow = [AFImageDownloader defaultInstance];
+    [dow.sessionManager setSecurityPolicy:policy];
+
     [dummyView setImageWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:URLRequest]]
-					 placeholderImage:nil
+					 placeholderImage:[UIImage imageNamed:@"placeholderImage"]
 							  success:^(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image) {
 								  weakSelf.downloadView.downloadImage = image;
 							  } failure:nil];
-	if(!self.imageData.isVideo)
+
+    if(!self.imageData.isVideo)
 	{
 		[ImageService downloadImage:self.imageData
 						 onProgress:^(NSProgress *progress) {

diff --git a/piwigo/Albums/ImageService.m b/piwigo/Albums/ImageService.m
@@ -247,6 +247,7 @@ +(NSURLSessionTask*)downloadImage:(PiwigoImageData*)image
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
     manager.responseSerializer = [AFImageResponseSerializer serializer];
 
+    // Ensure that SSL certificates won't be rejected
     AFSecurityPolicy *policy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
     [policy setAllowInvalidCertificates:YES];
     [policy setValidatesDomainName:NO];
@@ -283,6 +284,7 @@ +(NSURLSessionTask*)downloadVideo:(PiwigoImageData*)video
     NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
     AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfiguration:configuration];
 
+    // Ensure that SSL certificates won't be rejected
     AFSecurityPolicy *policy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
     [policy setAllowInvalidCertificates:YES];
     [policy setValidatesDomainName:NO];
@@ -291,7 +293,7 @@ +(NSURLSessionTask*)downloadVideo:(PiwigoImageData*)video
     NSString *URLRequest = [NetworkHandler getURLWithPath:[video.fullResPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] asPiwigoRequest:NO withURLParams:nil];
     NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:URLRequest]];
 
-    // replace .mp4 or .mv4 with .mov for compatibility with Photos.app
+    // Replace .mp4 or .mv4 with .mov for compatibility with Photos.app
     NSString *fileName = video.fileName;
     if (([[[video.fileName pathExtension] uppercaseString] isEqualToString:@"MP4"]) ||
         ([[[video.fileName pathExtension] uppercaseString] isEqualToString:@"M4V"])) {

diff --git a/piwigo/Network/NetworkHandler.m b/piwigo/Network/NetworkHandler.m
@@ -76,6 +76,7 @@ +(NSURLSessionTask*)post:(NSString*)path
     jsonResponseSerializer.acceptableContentTypes = jsonAcceptableContentTypes;
     manager.responseSerializer = jsonResponseSerializer;
 
+    // Ensure that SSL certificates won't be rejected
     AFSecurityPolicy *policy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
     [policy setAllowInvalidCertificates:YES];
     [policy setValidatesDomainName:NO];
@@ -118,6 +119,7 @@ +(NSURLSessionTask*)postMultiPart:(NSString*)path
     jsonResponseSerializer.acceptableContentTypes = jsonAcceptableContentTypes;
     manager.responseSerializer = jsonResponseSerializer;
 
+    // Ensure that SSL certificates won't be rejected
     AFSecurityPolicy *policy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
     [policy setAllowInvalidCertificates:YES];
     [policy setValidatesDomainName:NO];