Implemented re-scanning

Author: GeoSn0w

iSecureOS.xcodeproj/project.xcworkspace/xcuserdata/geosn0w.xcuserdatad/UserInterfaceState.xcuserstate

@@ -108,7 +108,7 @@ YouTube: iDevice Central</string>
                                 <fontDescription key="fontDescription" name="Futura-Medium" family="Futura" pointSize="17"/>
                                 <state key="normal" title="Perform iSecureOS Scan" backgroundImage="button_mask"/>
                                 <connections>
-                                    <segue destination="01f-sZ-FeH" kind="presentation" modalPresentationStyle="fullScreen" id="c3R-bq-Pxr"/>
+                                    <action selector="performScanNow:" destination="BYZ-38-t0r" eventType="touchUpInside" id="jKq-hC-GYx"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="infoDark" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="v2z-Ik-Lma">
@@ -203,10 +203,10 @@ YouTube: iDevice Central</string>
             </objects>
             <point key="canvasLocation" x="133.59999999999999" y="116.49175412293854"/>
         </scene>
-        <!--SecuriOS Logging-->
+        <!--ScanView-->
         <scene sceneID="uAH-On-fBx">
             <objects>
-                <viewController id="01f-sZ-FeH" customClass="securiOS_Logging" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="SscanView" title="ScanView" useStoryboardIdentifierAsRestorationIdentifier="YES" id="01f-sZ-FeH" customClass="securiOS_Logging" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="uXP-yS-OWE">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

securOS/Storyboards/Base.lproj/Main.storyboard

@@ -21,6 +21,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UIButton *backButton12;
 @property (weak, nonatomic) IBOutlet UITextView *logmeeh;
 @property (weak, nonatomic) IBOutlet UILabel *currentFile;
-
+void respringDeviceNow(void);
 @end
 NS_ASSUME_NONNULL_END

securOS/iSecureOS-Core/iSecureOS-Core.h

@@ -190,15 +190,12 @@ - (void) dismissKeyboard {
 
 int populateVulnerableReposFromSignatures() {
     SecurityRiskRepos = [[NSMutableArray alloc] init];
-    NSString *textFilePath = @"/var/mobile/iSecureOS/repo-signatures";
-    NSError *error;
-    NSString *fileContentsUrls = [NSString stringWithContentsOfFile:textFilePath encoding:NSUTF8StringEncoding error:&error];
-    NSData *decodedData = [[NSData alloc] initWithBase64EncodedString:fileContentsUrls options: NSDataBase64DecodingIgnoreUnknownCharacters];
-    NSString *base64DecodedString = [[NSString alloc] initWithData:decodedData encoding:NSUTF8StringEncoding];
+    NSString *repoDefinitionsPath = @"/var/mobile/iSecureOS/repo-signatures";
+    NSError *repoFileErr;
+    NSString *fileContentsUrls = [NSString stringWithContentsOfFile:repoDefinitionsPath encoding:NSUTF8StringEncoding error: &repoFileErr];
+    SecurityRiskRepos = [[fileContentsUrls componentsSeparatedByString:@"\n"] mutableCopy];
 
-    SecurityRiskRepos = [[base64DecodedString componentsSeparatedByString:@"\n"] mutableCopy];
-    NSLog(@"%@", base64DecodedString);
-    if (error == nil) {
+    if (repoFileErr == nil) {
         printf("Successfully loaded Repo Signatures into iSecureOS\n");
         return 0;
     } else {
@@ -628,6 +625,7 @@ void performSuspectRepoScanning() {
         printf("[ i ] You do not seem to have problematic repos installed. GREAT!\n\n");
     }
 }
+
 int execprog(const char *prog, const char* args[]) {
     if (args == NULL) {
         args = (const char **)&(const char*[]){ prog, NULL };
@@ -662,6 +660,12 @@ int execprog(const char *prog, const char* args[]) {
     return 0;
 }
 
+void respringDeviceNow() {
+    const char * arguments = "backboardd";
+    execprog("killall", &arguments);
+    return;
+}
+
 int checkActiveSSHConnection() {
     // Check if an active root connection is found
     int rootAccess = warnaxActiveSSHConnection("sshd: root@ttys");

securOS/iSecureOS-Core/iSecureOS-Core.m

@@ -95,4 +95,17 @@ - (BOOL) canAccessGitHubPages {
     return isConnected;
 }
 
+- (IBAction)performScanNow:(id)sender {
+    _currentStatus.text = @"You have never scanned.";
+    _shieldStatus.image = [UIImage imageNamed: @"shielderr.png"];
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        NSString * storyboardName = @"Main";
+        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:storyboardName bundle: nil];
+        UIViewController * vc = [storyboard instantiateViewControllerWithIdentifier:@"ScanView"];
+        [self presentViewController:vc animated:YES completion:nil];
+    });
+    [_secureOS_Load_Btn setTitle:@"Re-Scan" forState:UIControlStateNormal];
+}
+
 @end

securOS/iSecureOS-Main/iSecureOS-Main.m

@@ -13,6 +13,7 @@
 #include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include "iSecureOS-Core.h"
 
 @interface iSecureOS_Settings ()
 
@@ -168,8 +169,10 @@ - (IBAction)resetPasswordsAction:(id)sender {
                                                                        message:@"The SSH password for ROOT and MOBILE users has been reverted back to the default, alpine. Please do a scan with iSecureOS and change it to a new one that you will remember."
                                    preferredStyle:UIAlertControllerStyleAlert];
 
-        UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:@"Thank you" style:UIAlertActionStyleDefault
-                                       handler:^(UIAlertAction * action) {}];
+        UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:@"Respring" style:UIAlertActionStyleDefault
+                                       handler:^(UIAlertAction * action) {
+            respringDeviceNow();
+        }];
 
         [alert addAction:defaultAction];
         [self presentViewController:alert animated:YES completion:nil];