added logging

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   http2pic:
-    image: ghcr.io/hascheksolutions/http2pic:2
+    image: gitea.haschek.at/haschek-solutions/http2pic:2
     restart: unless-stopped
 
     environment:

docker/Dockerfile

@@ -12,6 +12,9 @@ RUN echo "error_log = /srv/logs/php_errors.log" >> /etc/php84/php.ini
 RUN apk add --no-cache php84-ctype php84-dom php84-fileinfo php84-gd php84-iconv php84-simplexml php84-xml php84-xmlreader php84-xmlwriter php84-zip php84-phar php84-openssl
 RUN curl -sS https://getcomposer.org/installer | /usr/bin/php84 -- --install-dir=/usr/bin --filename=composer
 
+# add symlink for php
+RUN ln -s /usr/bin/php84 /usr/bin/php
+
 ADD docker/start.sh /start.sh
 RUN chmod +x /start.sh
 

docker/dokploy-compose.yml

@@ -0,0 +1,21 @@
+services:
+  http2pic:
+    build:
+      context: ../
+      dockerfile: docker/Dockerfile
+    restart: unless-stopped
+    ports:
+      - 80
+    environment:
+      - URL=https://http2pic.haschek.at
+    networks:
+      - dokploy-network
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.http2pic.rule=Host(`http2pic.haschek.at`)"
+      - "traefik.http.routers.http2pic.entrypoints=websecure"
+      - "traefik.http.routers.http2pic.tls.certResolver=letsencrypt"
+      - "traefik.http.services.http2pic.loadbalancer.server.port=80"
+networks:
+  dokploy-network:
+    external: true

docker/start.sh

@@ -3,7 +3,7 @@ echo ' [+] Starting php'
 php-fpm84
 
 cd /srv/src
-composer install
+composer install --no-dev --optimize-autoloader
 
 echo ' [+] Starting Chrome'
 chromedriver --port=4444 &

src/helpers.php

@@ -14,3 +14,22 @@ function renderTemplate($templatename,$variables=[],$basepath=ROOT.'/src')
 
     return $rendered;
 }
+
+function addToLog($data)
+{
+    $fp = fopen(ROOT.DS.'logs'.DS.'app.log','a');
+    fwrite($fp,date("d.m.y H:i")."\t".$data."\n");
+    fclose($fp);
+}
+
+function getUserIP()
+{
+    if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+        $ip = $_SERVER['HTTP_CLIENT_IP'];
+    } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+        $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+    } else {
+        $ip = $_SERVER['REMOTE_ADDR'];
+    }
+    return $ip;
+}

src/templates/index.html.php

@@ -71,7 +71,7 @@
     <!-- Main Content -->
     <div class="container">
         <h2>How the API works</h2>
-        <div class="well"><h2 ><?=URL?>/api/url=<span style="color:#1e90ff">[WEBSITE_URL]</span>&amp;<span style="color:#C73C49">[OPTIONS]</span></h2></div><hr/><br/>
+        <div class="well"><h2 ><?=URL?>/api/?url=<span style="color:#1e90ff">[WEBSITE_URL]</span>&amp;<span style="color:#C73C49">[OPTIONS]</span></h2></div><hr/><br/>
         <div >
             <div>
                 <section>

web/index.php

@@ -1,36 +1,37 @@
 <?php
+
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 
 define('DS', DIRECTORY_SEPARATOR);
-define('ROOT', dirname(__FILE__).DS.'..');
+define('ROOT', dirname(__FILE__) . DS . '..');
 
-require_once(ROOT.DS.'src'.DS.'config.inc.php');
+require_once(ROOT . DS . 'src' . DS . 'config.inc.php');
-require_once(ROOT.DS.'src'.DS.'helpers.php');
+require_once(ROOT . DS . 'src' . DS . 'helpers.php');
-require_once(ROOT.DS.'src'.DS.'http2pic.class.php');
+require_once(ROOT . DS . 'src' . DS . 'http2pic.class.php');
-require_once(ROOT.DS.'src'.DS.'vendor'.DS.'autoload.php');
+require_once(ROOT . DS . 'src' . DS . 'vendor' . DS . 'autoload.php');
 
-$url = array_filter(explode('/',ltrim(parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH),'/')));
+$url = array_filter(explode('/', ltrim(parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH), '/')));
 
 //check for integrated server
-if(php_sapi_name()=='cli-server' && file_exists(ROOT.DS.'web'.DS.implode('/',$url)) && !is_dir(ROOT.DS.'web'.DS.implode('/',$url)))
+if (php_sapi_name() == 'cli-server' && file_exists(ROOT . DS . 'web' . DS . implode('/', $url)) && !is_dir(ROOT . DS . 'web' . DS . implode('/', $url)))
     return false;
 
 
-switch($url[0])
+switch ($url[0]) {
-{
     case 'api':
-        $target = substr($_SERVER['REQUEST_URI'],5);
+        $target = substr($_SERVER['REQUEST_URI'], 5);
-        if(!$target || !filter_var($target, FILTER_VALIDATE_URL))
+        if (!$target || !filter_var($target, FILTER_VALIDATE_URL))
             $target = $_REQUEST['url'];
-        if(!filter_var($target, FILTER_VALIDATE_URL))
+        if (!filter_var($target, FILTER_VALIDATE_URL)) {
-        {
             header('HTTP/1.0 400 Bad Request');
             echo 'Invalid URL';
             exit;
         }
+        $ip = getUserIP();
+
         $viewport = $_REQUEST['viewport'];
-        $js = $_REQUEST['js']=='false'?false:true;
+        $js = $_REQUEST['js'] == 'false' ? false : true;
 
         $serverUrl = 'http://localhost:4444';
         $options = new \Facebook\WebDriver\Chrome\ChromeOptions();
@@ -40,27 +41,31 @@ switch($url[0])
         $capabilities->setCapability(\Facebook\WebDriver\Chrome\ChromeOptions::CAPABILITY, $options);
 
         //disable javascript if $js is false
-        if(!$js)
+        if (!$js)
             $capabilities->setCapability('javascriptEnabled', false);
 
-        $driver = RemoteWebDriver::create($serverUrl, $capabilities);
 
-        $driver->get($target);
+        try {
+            $driver = RemoteWebDriver::create($serverUrl, $capabilities);
+            $driver->get($target);
+            //hide scroll bars
+            $driver->executeScript('document.body.style.overflow = "hidden";');
 
-        //hide scroll bars
+            //set screenshot size to 1920x1080
-        $driver->executeScript('document.body.style.overflow = "hidden";');
+            //$driver->manage()->window()->setSize(new \Facebook\WebDriver\WebDriverDimension(1024, 768));
-
+            //if $viewport is set, set window size
-        //set screenshot size to 1920x1080
+            if ($viewport) {
-        //$driver->manage()->window()->setSize(new \Facebook\WebDriver\WebDriverDimension(1024, 768));
+                $viewport = explode('x', $viewport);
-        //if $viewport is set, set window size
+                $driver->manage()->window()->setSize(new \Facebook\WebDriver\WebDriverDimension($viewport[0], $viewport[1]));
-        if($viewport)
+            } else {
-        {
+                $driver->manage()->window()->setSize(new \Facebook\WebDriver\WebDriverDimension(1024, 768));
-            $viewport = explode('x',$viewport);
+            }
-            $driver->manage()->window()->setSize(new \Facebook\WebDriver\WebDriverDimension($viewport[0], $viewport[1]));
+            addToLog("$ip\tRequested $target with viewport " . implode('x', $viewport) . " and js " . ($js ? 'enabled' : 'disabled'));
-        }
+        } catch (Exception $e) {
-        else
+            header('HTTP/1.0 500 Internal Server Error');
-        {
+            addToLog("$ip\tRequested $target but resulted in error:\t" . $e->getMessage());
-            $driver->manage()->window()->setSize(new \Facebook\WebDriver\WebDriverDimension(1024, 768));
+            echo 'Error: ' . $e->getMessage();
+            exit;
         }
 
         // take screenshot and save to file
@@ -68,7 +73,7 @@ switch($url[0])
         header('Content-Type: image/png');
         echo $driver->takeScreenshot();
 
-    break;
+        break;
     default:
         echo renderTemplate('index.html.php');
         break;