From 0eff189cd99ccc271f7109af3878004587a67152 Mon Sep 17 00:00:00 2001 From: Cesura Date: Tue, 30 Aug 2022 04:44:33 +0300 Subject: [PATCH] Make script use json endpoint + add support for raw viewing --- Dockerfile | 8 ++- Dockerfile-conda | 5 +- app.py | 2 +- pastey/routes.py | 47 ++++++++++++---- .../Dark/{docker.png => dockerfile.png} | Bin .../language/Light/302535_ini_file_icon.png | Bin 17716 -> 0 bytes .../Light/{docker.png => dockerfile.png} | Bin templates/config.html | 52 ++++++++++++++++-- templates/pastey.sh | 36 +++++++----- templates/view.html | 25 +++++---- 10 files changed, 129 insertions(+), 46 deletions(-) rename static/img/language/Dark/{docker.png => dockerfile.png} (100%) delete mode 100644 static/img/language/Light/302535_ini_file_icon.png rename static/img/language/Light/{docker.png => dockerfile.png} (100%) diff --git a/Dockerfile b/Dockerfile index ffc826d..3985c26 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,8 @@ FROM tensorflow/tensorflow:2.2.0 +WORKDIR /app +COPY requirements.txt /app +RUN mkdir -p /app/data && pip install -r /app/requirements.txt COPY . /app/ -RUN pip install -r /app/requirements.txt EXPOSE 5000 -WORKDIR /app -ENTRYPOINT ["python3","app.py"] \ No newline at end of file +ENV PASTEY_DATA_DIRECTORY=/app/data +ENTRYPOINT ["python3", "app.py"] diff --git a/Dockerfile-conda b/Dockerfile-conda index 3e24888..ee7b0df 100644 --- a/Dockerfile-conda +++ b/Dockerfile-conda @@ -2,7 +2,8 @@ FROM continuumio/conda-ci-linux-64-python3.8 USER root COPY . /app/ RUN conda install -c anaconda tensorflow=2.2.0 pip -RUN pip install -r /app/requirements.txt +RUN mkdir -p /app/data && pip install -r /app/requirements.txt EXPOSE 5000 WORKDIR /app -ENTRYPOINT ["python3","app.py"] \ No newline at end of file +ENV PASTEY_DATA_DIRECTORY=/app/data +ENTRYPOINT ["python3", "app.py"] diff --git a/app.py b/app.py index c233566..aff7923 100644 --- a/app.py +++ b/app.py @@ -6,7 +6,7 @@ from os import environ from distutils.util import strtobool from threading import Thread -pastey_version = "0.4.2" +pastey_version = "0.5" loaded_config = {} loaded_themes = [] diff --git a/pastey/routes.py b/pastey/routes.py index ebb8b9c..84a4c28 100644 --- a/pastey/routes.py +++ b/pastey/routes.py @@ -1,11 +1,12 @@ from __main__ import app, limiter, loaded_config from . import config, common, functions -from flask import Flask, render_template, request, redirect, abort +from flask import Flask, render_template, request, redirect, abort, make_response from urllib.parse import quote from datetime import datetime from os import environ import json +from base64 import b64decode # Load themes loaded_themes = common.get_themes() @@ -64,17 +65,29 @@ def config_page(): # View paste page @app.route("/view/") def view(unique_id): - content = functions.get_paste(unique_id) + paste = functions.get_paste(unique_id) - if content is not None: + if paste is not None: return render_template("view.html", - paste=content, + paste=paste, url=common.build_url(request, "/view/" + unique_id), whitelisted=common.verify_whitelist(common.get_source_ip(request)), active_theme=common.set_theme(request), themes=loaded_themes) else: abort(404) + +# View paste page (raw) +@app.route("/view//raw") +def view_raw(unique_id): + paste = functions.get_paste(unique_id) + + if paste is not None: + response = make_response(paste['content'], 200) + response.mimetype = "text/plain" + return response + else: + abort(404) # Delete paste @app.route("/delete/") @@ -88,7 +101,7 @@ def delete(unique_id): # Script download @app.route("/pastey") def pastey_script(): - return render_template('pastey.sh', endpoint=common.build_url(request, "/raw")), 200, { + return render_template('pastey.sh', endpoint=common.build_url(request, "/paste")), 200, { 'Content-Disposition': 'attachment; filename="pastey"', 'Content-Type': 'text/plain' } @@ -176,6 +189,12 @@ def paste_json(): abort(400) content = paste['content'] + # Check if content was base64 encoded (from the CLI client typically) + from_client = False + if 'base64' in paste and paste['base64'] == True: + from_client = True + content = b64decode(content).decode("utf-8") + # Optional fields title = paste['title'] if ('title' in paste and paste['title'].strip() != "") else "Untitled" single = paste['single'] if ('single' in paste and type(paste['single']) == bool) else False @@ -186,13 +205,19 @@ def paste_json(): # Create paste unique_id, key = functions.new_paste(title, content, source_ip, expires=expiration, single=single, encrypt=encrypt, language=language) if encrypt: - return { - "link": common.build_url(request, "/view/" + unique_id + "#" + quote(key)) - }, 200 + if from_client: + return common.build_url(request, "/view/" + unique_id + "#" + quote(key)), 200 + else: + return { + "link": common.build_url(request, "/view/" + unique_id + "#" + quote(key)) + }, 200 else: - return { - "link": common.build_url(request, "/view/" + unique_id) - }, 200 + if from_client: + return common.build_url(request, "/view/" + unique_id), 200 + else: + return { + "link": common.build_url(request, "/view/" + unique_id) + }, 200 # Custom 404 handler @app.errorhandler(404) diff --git a/static/img/language/Dark/docker.png b/static/img/language/Dark/dockerfile.png similarity index 100% rename from static/img/language/Dark/docker.png rename to static/img/language/Dark/dockerfile.png diff --git a/static/img/language/Light/302535_ini_file_icon.png b/static/img/language/Light/302535_ini_file_icon.png deleted file mode 100644 index 9ede796db274be7f2a08705041148c3315f2d0d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17716 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 diff --git a/static/img/language/Light/docker.png b/static/img/language/Light/dockerfile.png similarity index 100% rename from static/img/language/Light/docker.png rename to static/img/language/Light/dockerfile.png diff --git a/templates/config.html b/templates/config.html index 589de05..0666e71 100644 --- a/templates/config.html +++ b/templates/config.html @@ -121,11 +121,55 @@

Download Script

Pastey provides a script that can be used to paste output directly from the command line:

- 
$ cat /var/log/nginx.log | pastey
- 
$ echo "Hello, Pastey!" | pastey
+ 
$ pastey -f /var/log/nginx.log
+ 
$ echo "Hello, Pastey!" | pastey -c -

Download the following, make it executable, and put it in your system PATH to be used anywhere!

+ + + +
+ + + +
+
Usage: pastey [-h] [-v] [-f] -p param_value arg1 [arg2...]
+
+Script description here.
+
+Available options:
+
+-h, --help      Print this help and exit
+-v, --verbose   Print script debug info
+-c, --content   Pass the content of the paste in a simple argument
+-e, --encrypt   Encrypt the paste content
+-f, --file		Read the content from this file. If file is "-", read from stdin
+-s, --single    Create a paste that expires after the first view
+-t, --title     Set the title of the paste
+-x, --expiration
+Set the time in hours after which the paste expires
+
+--              Stop further option parsing
+Arguments passed after the -- option are evaluated
+as a command, and that command's output is pasted.
+The full command is used a the title.
+
+If zero arguments are passed,
+or none of --content, --file or -- are passed,
+content is read from stdin.
+
+ +
-
+

@@ -136,7 +180,7 @@
-

+

diff --git a/templates/pastey.sh b/templates/pastey.sh index d989825..c6d7fe6 100755 --- a/templates/pastey.sh +++ b/templates/pastey.sh @@ -7,7 +7,7 @@ # script framework based on https://betterdev.blog/minimal-safe-bash-script-template/ # initially adapted and written by Serge van Ginderachter -set -Eeuo pipefail +set -Eeo pipefail #execute=(echo popo)trap cleanup SIGINT SIGTERM ERR EXIT script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) @@ -74,8 +74,8 @@ parse_params() { content= title= file= - single= - encrypt= + single="false" + encrypt="false" while (( "$#" )) do @@ -114,12 +114,12 @@ parse_params() { -s | --single) shift || : - single="-F single=" + single="true" ;; -e | --encrypt) shift || : - encrypt="-F encrypt=" + encrypt="true" ;; --) @@ -170,7 +170,7 @@ parse_options(){ content="$(

{{ paste.title }}

- Format: {{ paste.language }}
+ + Format: {{ paste.language }} + {% if not paste.encrypted %} +  ( View Raw) + {% endif %}
+ Date: {{ paste.timestamp }}
{% if paste.expiration is defined and paste.expiration != "" %} Expires: {{ paste.expiration }}
@@ -139,15 +144,15 @@
-
-
- {% if paste.language == "Plaintext" %} - 
{{ paste.content }}
- {% else %} - 
{{ paste.content }}
- {% endif %} -
-
+
+
+ {% if paste.language == "Plaintext" %} + 
{{ paste.content }}
+ {% else %} + 
{{ paste.content }}
+ {% endif %} +
+