added simple web client

diff --git a/CHANGELOG b/CHANGELOG
index 79e23ba8c8b6dd50388995c7182a674d2fb4014f..c75c4d0590978cec42f65298bf0540900f06ca57 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 YYYYMMDD version 1.1 Boron
 * house cleaning
+* added a simple web client
+* cleaned up the linux client written in c. See README for more details
 
 20200426 version 1.0 Beryllium
 * final 1.0 working version

diff --git a/client/c-client/README b/client/c-client/README
index be49cb6a4e8de185b54ce9ca076acc15d0ce54f1..db1354b12be9591b902edd29f31be47385048538 100644 (file)
--- a/client/c-client/README
+++ b/client/c-client/README
@@ -1 +1,2 @@
-Linux client written in C. Can be build with the added Makefile
+Linux client written in C. Can be build with the added Makefile for linux
+Depends on libcurl (+ssl) https://curl.haxx.se and json-c https://github.com/json-c/json-c

diff --git a/client/webclient/config.default.php b/client/webclient/config.default.php
new file mode 100644 (file)
index 0000000..856bb47
--- /dev/null
+++ b/client/webclient/config.default.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the COMMON DEVELOPMENT AND DISTRIBUTION LICENSE
+ *
+ * You should have received a copy of the
+ * COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+ * along with this program.  If not, see http://www.sun.com/cddl/cddl.html
+ *
+ * 2019 - 2020 https://://www.bananas-playground.net/projekt/selfpaste
+ */
+
+/**
+ * this is the config file for the webclient
+ */
+
+/* please provide a unique username for this installation */
+define('FRONTEND_USERNAME','some');
+/* please provide a unique password for this installation */
+define('FRONTEND_PASSWORD', 'admin');
+/* please provide a unique secret for this installation and add this to the allowed ones*/
+define('THE_SECRET','your super duper secret');
+/* the selfpaste installation endpoint url. Absolute or relative */
+define('THE_ENDPOINT','http://www.some.tld/path/to/selfpaste/index.php');

diff --git a/client/webclient/index.php b/client/webclient/index.php
index beb4bdddd82e8a753fa2ed33e78c4c1e58c1dfb4..2be884b6ae61b12d38b143b46fc2691b8228dc29 100644 (file)
--- a/client/webclient/index.php
+++ b/client/webclient/index.php
@@ -11,7 +11,7 @@
  */
 
 /**
- * This is a simple web client which can be hosted whereevery you want.
+ * This is a simple web client which can be hosted where you want.
  * copy the config.default.php file to config.php and update its settings
  */
 
@@ -47,11 +47,41 @@ if (!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW'])
     exit;
 }
 
-exit("dosmoe");
-if(isset($_POST['dl']) && !empty($_POST['dl'])
-    && isset($_FILES['pasty']) && !empty($_FILES['pasty'])
-    && isset(SELFPASTE_UPLOAD_SECRET[$_POST['dl']])) {
-    $_create = true;
+$statusMessage = "";
+if(isset($_POST['doSome'])) {
+    $_text = trim($_POST['asText']);
+    $_file = $_FILES['uploadFile'];
+
+    if(!empty($_text) && !empty($_file['tmp_name'])) {
+        $statusMessage = "One option. Not both at the same time.";
+    }
+    elseif (!empty($_text)) {
+        $_tmpfile = tmpfile();
+        fwrite($_tmpfile, $_text);
+        $data['pasty'] = curl_file_create(stream_get_meta_data($_tmpfile)['uri']);
+    }
+    elseif(!empty($_file['tmp_name'])) {
+
+        if($_file['error'] === UPLOAD_ERR_OK) {
+            $data['pasty'] = curl_file_create($_file['tmp_name']);
+        }
+        else {
+            $statusMessage = "Upload of selected file failed.";
+        }
+    }
+
+    if(empty($statusMessage)) {
+        $data['dl'] = THE_SECRET;
+        $call = curlPostUploadCall(THE_ENDPOINT,$data);
+
+        $statusMessage = "Something went wrong. ".var_export($call,true);
+        $json = json_decode($call,true);
+        if(!empty($call) && $json != NULL) {
+            if (isset($json['message']) && $json['status'] == "200") {
+                $statusMessage = $json['message'];
+            }
+        }
+    }
 }
 
 ?>
@@ -60,14 +90,58 @@ if(isset($_POST['dl']) && !empty($_POST['dl'])
     <title>selfpaste - add a new one</title>
 </head>
 <body>
-<form method="post" enctype="multipart/form-data" action="<?php echo THE_ENDPOINT; ?>">
-    <input type="hidden" name="dl" value="<?php echo THE_SECRET; ?>">
+<?php if(!empty($statusMessage)) { ?>
+<p><?php echo $statusMessage; ?></p>
+<?php } ?>
+<form method="post" enctype="multipart/form-data" action="">
     <p>
-        <textarea name="" cols="100" rows="10"></textarea>
+        <textarea name="asText" cols="100" rows="20"></textarea>
     </p>
-    <p><input type="file" name="pasty"></p>
+    <p><input type="file" name="uploadFile"></p>
     <p><input type="submit" value="send" name="doSome"></p>
 </form>
 </body>
 </html>
+<?php
+/**
+ * functions start here
+ */
 
+/**
+ * execute a curl call to the given $url
+ * @param string $url The request url
+ * @param bool $port
+ * @return bool|mixed
+ */
+function curlPostUploadCall($url,$data,$port=false) {
+    $ret = false;
+
+    $ch = curl_init();
+
+    curl_setopt($ch, CURLOPT_URL, $url);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
+    curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+    curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+    curl_setopt($ch, CURLOPT_MAXREDIRS, 2);
+
+    curl_setopt($ch, CURLOPT_POST,1);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+
+    if(!empty($port)) {
+        curl_setopt($ch, CURLOPT_PORT, $port);
+    }
+
+    $do = curl_exec($ch);
+
+    if(is_string($do) === true) {
+        $ret = $do;
+    }
+    else {
+        error_log(var_export(curl_error($ch),true));
+    }
+
+    curl_close($ch);
+
+    return $ret;
+}