From 978760099136e31ad0ab02255e0f82d90a01f948 Mon Sep 17 00:00:00 2001 From: Matheus Oliveira Date: Thu, 21 May 2020 14:21:33 -0300 Subject: [PATCH 1/5] Pequenas modificacoes --- src/app.py | 2 +- src/files/.gitkeep | 0 src/templates/upload.html | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 src/files/.gitkeep diff --git a/src/app.py b/src/app.py index 3b65a06..7527ef8 100644 --- a/src/app.py +++ b/src/app.py @@ -16,7 +16,7 @@ def index(): @app.route("/upload", methods=["POST"]) def upload(): - folder_name = request.form['superhero'] + folder_name = 'files' ''' # this is to verify that folder to upload to exists. if os.path.isdir(os.path.join(APP_ROOT, 'files/{}'.format(folder_name))): diff --git a/src/files/.gitkeep b/src/files/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/templates/upload.html b/src/templates/upload.html index 0382efa..b8066ca 100644 --- a/src/templates/upload.html +++ b/src/templates/upload.html @@ -25,7 +25,7 @@ //koala.jpg, koala.JPG substring(index) lastIndexOf('a') koala.1.jpg var ext= input.files[i].name.substring(input.files[i].name.lastIndexOf('.')+1).toLowerCase() - if ((ext == 'jpg') || (ext == 'png')) + if ((ext == 'jpg') || (ext == 'png') || (ext == 'sql') || (ext == 'txt') || (ext == 'tar')) { $("#msg").text("Files are supported") } From 8c91ce241fc09951a20399864fc6c8993b3a1dc3 Mon Sep 17 00:00:00 2001 From: Matheus Oliveira Date: Thu, 21 May 2020 14:39:54 -0300 Subject: [PATCH 2/5] Pequenas modificacoes --- Dockerfile | 5 +++++ docker-compose.yml | 10 ++++++++++ src/app.py | 4 ++-- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..bee6afa --- /dev/null +++ b/Dockerfile @@ -0,0 +1,5 @@ +FROM python:3.8.2-alpine +RUN apk update && pip install flask +COPY src /app/src +WORKDIR /app/src +CMD python3 /app/src/app.py \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..5e78a26 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,10 @@ +version: '3' +services: + upload_file_python: + build: . + image: upload_file_python + container_name: upload_file_python + ports: + - 4555:4555 + volumes: + - /opt/upload_file_python/files:/app/src/files \ No newline at end of file diff --git a/src/app.py b/src/app.py index 7527ef8..a3e3b0e 100644 --- a/src/app.py +++ b/src/app.py @@ -33,7 +33,7 @@ def upload(): filename = upload.filename # This is to verify files are supported ext = os.path.splitext(filename)[1] - if (ext == ".jpg") or (ext == ".png"): + if (ext == ".jpg") or (ext == ".png") or (ext == ".sql") or (ext == ".txt") or (ext == ".tar"): print("File supported moving on...") else: render_template("Error.html", message="Files uploaded are not supported...") @@ -59,4 +59,4 @@ def get_gallery(): if __name__ == "__main__": - app.run(port=4555, debug=True) + app.run(port=4555, debug=True, host='0.0.0.0') From 4331213b352c0860604fd562fcd48576d4912f1f Mon Sep 17 00:00:00 2001 From: Matheus Oliveira <45184376+matheusolivv@users.noreply.github.com> Date: Wed, 3 Jun 2020 14:06:36 -0300 Subject: [PATCH 3/5] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5e78a26..b216eb4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,4 +7,4 @@ services: ports: - 4555:4555 volumes: - - /opt/upload_file_python/files:/app/src/files \ No newline at end of file + - ./src/files:/app/src/files From 1af145f6a984619cd499ee3cbb5cbcd4f33b4f9a Mon Sep 17 00:00:00 2001 From: Matheus Oliveira <45184376+matheusolivv@users.noreply.github.com> Date: Wed, 3 Jun 2020 14:10:43 -0300 Subject: [PATCH 4/5] Update app.py --- src/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app.py b/src/app.py index a3e3b0e..8b6cebc 100644 --- a/src/app.py +++ b/src/app.py @@ -33,7 +33,7 @@ def upload(): filename = upload.filename # This is to verify files are supported ext = os.path.splitext(filename)[1] - if (ext == ".jpg") or (ext == ".png") or (ext == ".sql") or (ext == ".txt") or (ext == ".tar"): + if (ext == ".jpg") or (ext == ".png") or (ext == ".sql") or (ext == ".txt") or (ext == ".tar") or (ext == ".py"): print("File supported moving on...") else: render_template("Error.html", message="Files uploaded are not supported...") From a31f9cbd42a91e1524c844676119edaf37e3d7c8 Mon Sep 17 00:00:00 2001 From: Matheus Oliveira <45184376+matheusolivv@users.noreply.github.com> Date: Wed, 3 Jun 2020 14:11:24 -0300 Subject: [PATCH 5/5] Update upload.html --- src/templates/upload.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/templates/upload.html b/src/templates/upload.html index b8066ca..22fe76b 100644 --- a/src/templates/upload.html +++ b/src/templates/upload.html @@ -25,7 +25,7 @@ //koala.jpg, koala.JPG substring(index) lastIndexOf('a') koala.1.jpg var ext= input.files[i].name.substring(input.files[i].name.lastIndexOf('.')+1).toLowerCase() - if ((ext == 'jpg') || (ext == 'png') || (ext == 'sql') || (ext == 'txt') || (ext == 'tar')) + if ((ext == 'jpg') || (ext == 'png') || (ext == 'sql') || (ext == 'txt') || (ext == 'tar' || (ext == 'py')) { $("#msg").text("Files are supported") } @@ -41,4 +41,4 @@ } ); - \ No newline at end of file +