From 9f8cf0bf387edcf86ed1ce4753bf9db452a750d4 Mon Sep 17 00:00:00 2001
From: Christopher Vagnetoft <noccylabs@gmail.com>
Date: Thu, 21 Jul 2016 03:08:06 +0200
Subject: [PATCH] Updated stubs, improved PHP7 compatibility

---
 README.md                 |   5 +++++
 bin/bootstrap.php         |   2 ++
 bin/systemtest.php        |   9 ++++++++-
 composer.json             |   3 ++-
 makephar                  | Bin 30830 -> 34111 bytes
 share/nullpatch.fix       |   5 ++---
 src/Hotfix/Hotfix.php     |   1 +
 src/Hotfix/Loader.php     |  14 +++++++++-----
 src/HotfixApplication.php |   2 +-
 src/stubs/bash.stub       |   9 +++++----
 10 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index f73d343..315f510 100644
--- a/README.md
+++ b/README.md
@@ -18,3 +18,8 @@ HotFix; Quickly patch and fix system
 
     $ hotfix sign test.hotfix
 
+
+## Building the executable
+
+Included is `makephar`, a utility to create highly compressed self-executable 
+php archives.
diff --git a/bin/bootstrap.php b/bin/bootstrap.php
index 6fefdcc..8179951 100644
--- a/bin/bootstrap.php
+++ b/bin/bootstrap.php
@@ -1,5 +1,7 @@
 <?php
 
+define("APP_VERSION", "0.1-pre");
+
 require_once __DIR__."/../vendor/autoload.php";
 require_once __DIR__."/systemtest.php";
 if (file_exists(__DIR__."/banner.php"))
diff --git a/bin/systemtest.php b/bin/systemtest.php
index 722f2f8..71fa1d5 100644
--- a/bin/systemtest.php
+++ b/bin/systemtest.php
@@ -2,6 +2,13 @@
 
 if (!is_callable("gnupg_init")) {
     fprintf(STDERR, "Error: The PHP GnuPG extension is not installed.\n\n");
-    fprintf(STDERR,"  * Debian/Ubuntu: Resolve with 'sudo apt-get install php5-gnupg' (or 'php7-gnupg')\n");
+    if (PHP_VERSION_ID >= 7) {
+        fprintf(STDERR, "Resolve using pecl:\n  sudo pecl install gnupg-1.4.0RC1\n");
+        fprintf(STDERR, "  echo 'extension=gnupg.so' | sudo tee /etc/php/7.0/mods-available/gnupg.ini\n");
+        fprintf(STDERR, "  sudo phpenmod gnupg\n");
+    } else {
+        fprintf(STDERR,"  * Debian/Ubuntu: Resolve with 'sudo apt-get install php5-gnupg'\n");
+        fprintf(STDERR,"  * Any distro: Resolve with 'sudp pecl install gnupg', follow instructions to enable.\n");
+    }
     die();
 }
diff --git a/composer.json b/composer.json
index d8aaa89..71fb238 100644
--- a/composer.json
+++ b/composer.json
@@ -16,6 +16,7 @@
     },
     "require": {
         "symfony/console": "^3.0",
-        "symfony/yaml": "^3.0"
+        "symfony/yaml": "^3.0",
+        "noccylabs/downloader": "@dev"
     }
 }
diff --git a/makephar b/makephar
index ebb2ac90efa4abf9c43fd7c21ae7e705de3e92ec..f3ebc9c4f58ec5a6e98330e576afe6196116e60e 100755
GIT binary patch
delta 3186
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
E1LI1hwEzGB

delta 404
zcmdnr#q{n2<AeZK6J0|S^@-KWo0l=kOR>f?F)(mXJ|&~ZoOzaS@@E-Ufqota1|T~e
zM4JXY_nWLCtHc8mZ~-bc<>5RuxmQ+RU?Cqw6^OoO>@{KX6Io@j5nOT>VA@sA08CfN
z*@5Yuat>hnkDL{lwv-3co6F>rm?l?f<!`>O=*KiUU**PRFI9!fIjZWDXQ(P}-mR*~
zH2J)d%;XI!W&(cs3b~2dsRbE{MS98kd1;d?G|uuXp$I8$4$x#`)Kf_+&CE$jEz-3E
zGc+`<xwvY%xK#2BN{SV171C2nfGiEAjIz9ZtK6!|uG)^1cWb+Do~cvCI5|YGbMiMm
z+sQuql9N{%>TI5*Z^yJ*#%vqo=3nLsOq1>GcsGBsUd1$dzMY1IN=Zg$v94V~QGP+O
zo>EMnlAcO&NokVxW_9~K_RW<Zt88TC%zgJxyu1BJblg`aroYkhy`}qK00WZ2-O1Mp
E0JrjrJpcdz

diff --git a/share/nullpatch.fix b/share/nullpatch.fix
index e816889..0e00a84 100644
--- a/share/nullpatch.fix
+++ b/share/nullpatch.fix
@@ -6,6 +6,5 @@ author: Noccy <cvagnetoft@gmail.com>
 lang:   bash
 ---
 
-echo "Hello World"
-
-echo "This is executing in bash! Woot"
+info "Hello World"
+exec "ls -al"
diff --git a/src/Hotfix/Hotfix.php b/src/Hotfix/Hotfix.php
index c4df8d2..5a510fa 100644
--- a/src/Hotfix/Hotfix.php
+++ b/src/Hotfix/Hotfix.php
@@ -57,6 +57,7 @@ class Hotfix
                 break;
             case 'php':
                 $exec = "/usr/bin/env php";
+                $head = "<?php require_once \"".__DIR__."/../../vendor/autoload.php\"; ".file_get_contents(__DIR__."/../stubs/php.stub");
                 break;
             default:
                 fprintf(STDERR, "Error: Unsupported language %s\n", $lang);
diff --git a/src/Hotfix/Loader.php b/src/Hotfix/Loader.php
index ace3013..794b0b9 100644
--- a/src/Hotfix/Loader.php
+++ b/src/Hotfix/Loader.php
@@ -44,7 +44,11 @@ class Loader
             } else {
                 list ($body, $signature) = explode($sigHeader, $hotfix);
                 $signature = $sigHeader.$signature;
-                $signer = $this->verifySignature($body, $signature);
+                if (!$insecure) {
+                    $signer = $this->verifySignature($body, $signature);
+                } else {
+                    $signer = null;
+                }
             }
             return new Hotfix($body, $signer);
         }
@@ -64,6 +68,10 @@ class Loader
         $fingerprint = $sigInfo[0]['fingerprint'];
         $keyInfo = gnupg_keyinfo($gpg, $fingerprint);
 
+        if (empty($keyInfo)) {
+            throw new \Exception("Unknown signer (key id {$sigInfo[0]['fingerprint']})");
+        }
+
         $subKeys = $keyInfo[0]['subkeys'];
         $keyId = null;
         foreach ($subKeys as $subKey) {
@@ -73,10 +81,6 @@ class Loader
             }
         }
 
-        if (empty($keyInfo)) {
-            throw new \Exception("Unknown signer (key id {$sigInfo[0]['fingerprint']})");
-        }
-
         return [ $keyInfo[0], $keyId ];
     }
 }
diff --git a/src/HotfixApplication.php b/src/HotfixApplication.php
index 98652b2..04c192d 100644
--- a/src/HotfixApplication.php
+++ b/src/HotfixApplication.php
@@ -8,7 +8,7 @@ class HotfixApplication extends Application
 {
     public function __construct()
     {
-        parent::__construct("Hotfixer", "0.1");
+        parent::__construct("Hotfix", APP_VERSION." (".PHAR_BUILD_DATE.")");
         $this->add(new Command\ApplyCommand());
         $this->add(new Command\SignCommand());
     }
diff --git a/src/stubs/bash.stub b/src/stubs/bash.stub
index db928bb..34ba3f4 100644
--- a/src/stubs/bash.stub
+++ b/src/stubs/bash.stub
@@ -2,14 +2,15 @@ test -e /etc/lsb-release && source /etc/lsb-release
 
 function exec() {
     echo -e "\e[36;1m[exec]\e[36;21m $*\e[0m"
-    LOG=$(tempfile -p exec)
-    $@ &>$LOG
+    # LOG=$(tempfile -p exec)
+    $@ 
+    # &>$LOG
     EC=$?
     if [ $EC -gt 0 ]; then
         echo -e "\e[31;1m[warn]\e[31;21m Command completed with exitcode $EC\e[0m"
-        tail -n5 $LOG | awk '{ print "  " $0 }'
+        # tail -n5 $LOG | awk '{ print "  " $0 }'
     fi
-    rm $LOG
+    # rm $LOG
 }
 function info() {
     echo -e "\e[32;1m[info]\e[32;21m $*\e[0m"