Integrate with logs service.

Scripts/debug_log_upload.py

@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+import sys
+import os
+import re
+import commands
+import subprocess
+import argparse
+import inspect    
+import urllib2
+import json
+
+def fail(message):
+    file_name = __file__
+    current_line_no = inspect.stack()[1][2]
+    current_function_name = inspect.stack()[1][3]
+    print 'Failure in:', file_name, current_line_no, current_function_name
+    print message
+    sys.exit(1)
+
+
+def execute_command(command):
+    try:
+        print ' '.join(command)
+        output = subprocess.check_output(command)
+        if output:
+            print output
+    except subprocess.CalledProcessError as e:
+        print e.output
+        sys.exit(1)
+
+        
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description='Precommit cleanup script.')
+    parser.add_argument('--file', help='used for starting a new version.')
+
+    args = parser.parse_args()
+    
+    params_response = urllib2.urlopen("https://debuglogs.org/").read()
+    
+    params = json.loads(params_response)
+    
+    upload_url = params['url']
+    upload_fields = params['fields']
+    upload_key = upload_fields['key']
+    upload_key = upload_key + os.path.splitext(args.file)[1]
+    upload_fields['key'] = upload_key
+    
+    download_url = 'https://debuglogs.org/' + upload_key
+    print 'download_url:', download_url
+    
+    curl_command = ['curl', '-v', '-i', '-X', 'POST']
+    for field_name in upload_fields:
+        field_value = upload_fields[field_name]
+        curl_command.append('-F')
+        curl_command.append("'%s=%s'" % (field_name, field_value, ))
+    curl_command.append('-F')
+    curl_command.append("'file=@%s'" % (args.file,))
+    curl_command.append(upload_url)
+    
+    # execute_command(curl_command)
+    print ' '.join(curl_command)
+
+    print 'download_url:', download_url
+    

Signal/src/AppDelegate.m

@@ -1112,9 +1112,6 @@ static NSString *const kURLHostVerifyPrefix             = @"verify";
     [OWSPreferences setIsReadyForAppExtensions];
 
     [self ensureRootViewController];
-
-    // TODO: Remove
-    [Pastelog submitLogs];
 }
 
 - (void)registrationStateDidChange

Signal/src/util/Pastelog.m

@@ -5,6 +5,7 @@
 #import "Pastelog.h"
 #import "Signal-Swift.h"
 #import "ThreadUtil.h"
+#import "zlib.h"
 #import <AFNetworking/AFNetworking.h>
 #import <SSZipArchive/SSZipArchive.h>
 #import <SignalMessaging/DebugLogger.h>
@@ -15,9 +16,6 @@
 #import <SignalServiceKit/TSStorageManager.h>
 #import <SignalServiceKit/Threading.h>
 
-// TODO: Remove
-#import "NSData+hexString.h"
-
 NS_ASSUME_NONNULL_BEGIN
 
 typedef void (^UploadDebugLogsSuccess)(NSURL *url);
@@ -63,13 +61,6 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error
     self.success = success;
     self.failure = failure;
 
-    // TODO: Remove
-    NSData *data = [NSData dataWithContentsOfURL:fileUrl];
-    DDLogInfo(@"%@ data: %zd", self.logTag, data.length);
-    NSData *header = [data subdataWithRange:NSMakeRange(0, MIN((NSUInteger)256, data.length))];
-    NSString *hexString = [header hexadecimalString];
-    DDLogInfo(@"%@ hexString: %@", self.logTag, hexString);
-
     [self getUploadParameters];
 }
 
@@ -77,11 +68,6 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error
 {
     __weak DebugLogUploader *weakSelf = self;
 
-    // TODO: Remove
-    // The JSON object it returns has two elements, URL, and "fields". Just POST to "ur" with a multipart/form-data body
-    // that has each KV pair in "fields" encoded as a form element. Add your file, called "file", and what you post will
-    // be at debuglogs.org/fields['key']
-
     NSURLSessionConfiguration *sessionConf = NSURLSessionConfiguration.ephemeralSessionConfiguration;
     AFHTTPSessionManager *sessionManager =
         [[AFHTTPSessionManager alloc] initWithBaseURL:nil sessionConfiguration:sessionConf];
@@ -129,6 +115,8 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error
                     failWithError:OWSErrorWithCodeDescription(OWSErrorCodeDebugLogUploadFailed, @"Invalid response")];
                 return;
             }
+            NSString *fileExtension = weakSelf.fileUrl.lastPathComponent.pathExtension;
+            uploadKey = [uploadKey stringByAppendingPathExtension:fileExtension];
             [weakSelf uploadFileWithUploadUrl:uploadUrl fields:fields uploadKey:uploadKey];
         }
         failure:^(NSURLSessionDataTask *_Nullable task, NSError *error) {
@@ -148,7 +136,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error
     AFHTTPSessionManager *sessionManager =
         [[AFHTTPSessionManager alloc] initWithBaseURL:nil sessionConfiguration:sessionConf];
     sessionManager.requestSerializer = [AFHTTPRequestSerializer serializer];
-    sessionManager.responseSerializer = [AFJSONResponseSerializer serializer];
+    sessionManager.responseSerializer = [AFHTTPResponseSerializer serializer];
     [sessionManager POST:uploadUrl
         parameters:@{}
         constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
@@ -297,7 +285,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error
                              actionWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_EMAIL",
                                                  @"Label for the 'email debug log' option of the the debug log alert.")
                                        style:UIAlertActionStyleDefault
-                                     handler:^(UIAlertAction *_Nonnull action) {
+                                     handler:^(UIAlertAction *action) {
                                          [Pastelog.sharedManager submitEmail:url];
 
                                          completion();
@@ -306,7 +294,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error
                              actionWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_COPY_LINK",
                                                  @"Label for the 'copy link' option of the the debug log alert.")
                                        style:UIAlertActionStyleDefault
-                                     handler:^(UIAlertAction *_Nonnull action) {
+                                     handler:^(UIAlertAction *action) {
                                          UIPasteboard *pb = [UIPasteboard generalPasteboard];
                                          [pb setString:url.absoluteString];
 
@@ -317,7 +305,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error
                              actionWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_SEND_TO_SELF",
                                                  @"Label for the 'send to self' option of the the debug log alert.")
                                        style:UIAlertActionStyleDefault
-                                     handler:^(UIAlertAction *_Nonnull action) {
+                                     handler:^(UIAlertAction *action) {
                                          [Pastelog.sharedManager sendToSelf:url];
                                      }]];
         [alert
@@ -325,7 +313,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error
                           actionWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_SEND_TO_LAST_THREAD",
                                               @"Label for the 'send to last thread' option of the the debug log alert.")
                                     style:UIAlertActionStyleDefault
-                                  handler:^(UIAlertAction *_Nonnull action) {
+                                  handler:^(UIAlertAction *action) {
                                       [Pastelog.sharedManager sendToMostRecentThread:url];
                                   }]];
 #endif
@@ -334,7 +322,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error
                           actionWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_BUG_REPORT",
                                               @"Label for the 'Open a Bug Report' option of the the debug log alert.")
                                     style:UIAlertActionStyleCancel
-                                  handler:^(UIAlertAction *_Nonnull action) {
+                                  handler:^(UIAlertAction *action) {
                                       [Pastelog.sharedManager prepareRedirection:url completion:completion];
                                   }]];
         UIViewController *presentingViewController
@@ -404,8 +392,13 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error
     }
 
     // Phase 2. Zip up the log files.
-    BOOL zipSuccess =
+    BOOL zipSuccess = [SSZipArchive createZipFileAtPath:zipFilePath
-        [SSZipArchive createZipFileAtPath:zipFilePath withContentsOfDirectory:zipDirPath withPassword:nil];
+                                withContentsOfDirectory:zipDirPath
+                                    keepParentDirectory:YES
+                                       compressionLevel:Z_DEFAULT_COMPRESSION
+                                               password:nil
+                                                    AES:NO
+                                        progressHandler:nil];
     if (!zipSuccess) {
         failure(NSLocalizedString(
             @"DEBUG_LOG_ALERT_COULD_NOT_PACKAGE_LOGS", @"Error indicating that the debug logs could not be packaged."));
@@ -460,7 +453,11 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error
 {
     NSString *emailAddress = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"LOGS_EMAIL"];
 
-    NSString *urlString = [NSString stringWithString: [[NSString stringWithFormat:@"mailto:%@?subject=iOS%%20Debug%%20Log&body=", emailAddress] stringByAppendingString:[[NSString stringWithFormat:@"Log URL: %@ \n Tell us about the issue: ", url]stringByAddingPercentEscapesUsingEncoding:NSASCIIStringEncoding]]];
+    NSString *body = [NSString stringWithFormat:@"Log URL: %@ \n Tell us about the issue: ", url];
+    NSString *escapedBody =
+        [body stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet];
+    NSString *urlString =
+        [NSString stringWithFormat:@"mailto:%@?subject=iOS%%20Debug%%20Log&body=%@", emailAddress, escapedBody];
 
     [UIApplication.sharedApplication openURL:[NSURL URLWithString:urlString]];
 }
@@ -481,7 +478,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error
     [alert addAction:[UIAlertAction
                          actionWithTitle:NSLocalizedString(@"OK", @"")
                                    style:UIAlertActionStyleDefault
-                                 handler:^(UIAlertAction *_Nonnull action) {
+                                 handler:^(UIAlertAction *action) {
                                      [UIApplication.sharedApplication
                                          openURL:[NSURL URLWithString:[[NSBundle mainBundle]
                                                                           objectForInfoDictionaryKey:@"LOGS_URL"]]];
@@ -502,10 +499,9 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error
 
     DispatchMainThreadSafe(^{
         __block TSThread *thread = nil;
-        [TSStorageManager.dbReadWriteConnection
+        [TSStorageManager.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
-            readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
+            thread = [TSContactThread getOrCreateThreadWithContactId:recipientId transaction:transaction];
-                thread = [TSContactThread getOrCreateThreadWithContactId:recipientId transaction:transaction];
+        }];
-            }];
         [ThreadUtil sendMessageWithText:url.absoluteString inThread:thread messageSender:messageSender];
     });
 
@@ -518,15 +514,18 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error
     if (![TSAccountManager isRegistered]) {
         return;
     }
-    OWSMessageSender *messageSender = Environment.current.messageSender;
 
+    __block TSThread *thread = nil;
+    [TSStorageManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
+        thread = [[transaction ext:TSThreadDatabaseViewExtensionName] firstObjectInGroup:TSInboxGroup];
+    }];
     DispatchMainThreadSafe(^{
-        __block TSThread *thread = nil;
+        if (thread) {
-        [TSStorageManager.dbReadWriteConnection
+            OWSMessageSender *messageSender = Environment.current.messageSender;
-            readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
+            [ThreadUtil sendMessageWithText:url.absoluteString inThread:thread messageSender:messageSender];
-                thread = [[transaction ext:TSThreadDatabaseViewExtensionName] firstObjectInGroup:[TSThread collection]];
+        } else {
-            }];
+            [Pastelog showFailureAlertWithMessage:@"Could not find last thread."];
-        [ThreadUtil sendMessageWithText:url.absoluteString inThread:thread messageSender:messageSender];
+        }
     });
 
     // Also copy to pasteboard.