simono41/snappass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adding json-output for api-like functionality (#147)

Browse source 
* adding json-template for api-like functionality

* removing content-block

* adding test

* changing to flask.jsonify

* deleting template

* change from POST-param to Accept-Header
This commit is contained in:
Christian 2022-04-11 21:37:19 +02:00 committed by GitHub
parent 4b1ee0cec1
commit 3fbc018ff8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
snappass/main.py
View file

@ -5,7 +5,7 @@ import uuid
import redis import redis
from cryptography.fernet import Fernet from cryptography.fernet import Fernet
from flask import abort, Flask, render_template, request from flask import abort, Flask, render_template, request, jsonify
from redis.exceptions import ConnectionError from redis.exceptions import ConnectionError
from werkzeug.urls import url_quote_plus from werkzeug.urls import url_quote_plus
from werkzeug.urls import url_unquote_plus from werkzeug.urls import url_unquote_plus
@ -177,6 +177,9 @@ def handle_password():
if URL_PREFIX: if URL_PREFIX:
base_url = base_url + URL_PREFIX.strip("/") + "/" base_url = base_url + URL_PREFIX.strip("/") + "/"
link = base_url + url_quote_plus(token) link = base_url + url_quote_plus(token)
if request.accept_mimetypes.accept_json and not request.accept_mimetypes.accept_html:
return jsonify(link=link, ttl=ttl)
else:
return render_template('confirm.html', password_link=link) return render_template('confirm.html', password_link=link)

16
tests.py
View file

@ -3,6 +3,7 @@ import re
import time import time
import unittest import unittest
import uuid import uuid
import json
from unittest import TestCase from unittest import TestCase
from cryptography.fernet import Fernet from cryptography.fernet import Fernet
@ -139,6 +140,21 @@ class SnapPassRoutesTestCase(TestCase):
frozen_time.move_to("2020-05-22 12:00:00") frozen_time.move_to("2020-05-22 12:00:00")
self.assertIsNone(snappass.get_password(key)) self.assertIsNone(snappass.get_password(key))
def test_set_password_json(self):
with freeze_time("2020-05-08 12:00:00") as frozen_time:
password = 'my name is my passport. verify me.'
rv = self.app.post('/', headers={'Accept': 'application/json'}, data={'password': password, 'ttl': 'two weeks'})
json_content = rv.get_json()
key = re.search(r'https://localhost/([^"]+)', json_content['link']).group(1)
key = unquote(key)
frozen_time.move_to("2020-05-22 11:59:59")
self.assertEqual(snappass.get_password(key), password)
frozen_time.move_to("2020-05-22 12:00:00")
self.assertIsNone(snappass.get_password(key))
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()