mirror/liteshort
1
0
Fork 0
mirror of https://git.ikl.sh/132ikl/liteshort.git synced 2023-08-10 21:13:04 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10 from eibex/master

Browse Source 
Add option to prevent links to site_domain
This commit is contained in:
132ikl 2020-01-16 14:33:40 -05:00 committed by GitHub
commit aad08830f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.yml
View File

@ -63,3 +63,6 @@ latest: 'l'
# Default: true # Default: true
show_github_link: true show_github_link: true
# Boolean: Allow short URLs linking to your site_domain URL
# Default: false
selflinks: false

11
liteshort.py
View File

@ -22,13 +22,13 @@ def load_config():
req_options = {'admin_username': 'admin', 'database_name': "urls", 'random_length': 4, req_options = {'admin_username': 'admin', 'database_name': "urls", 'random_length': 4,
'allowed_chars': 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_', 'allowed_chars': 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_',
'random_gen_timeout': 5, 'site_name': 'liteshort', 'site_domain': None, 'show_github_link': True, 'random_gen_timeout': 5, 'site_name': 'liteshort', 'site_domain': None, 'show_github_link': True,
'secret_key': None, 'disable_api': False, 'subdomain': '', 'latest': 'l' 'secret_key': None, 'disable_api': False, 'subdomain': '', 'latest': 'l', 'selflinks': False
} }
config_types = {'admin_username': str, 'database_name': str, 'random_length': int, config_types = {'admin_username': str, 'database_name': str, 'random_length': int,
'allowed_chars': str, 'random_gen_timeout': int, 'site_name': str, 'allowed_chars': str, 'random_gen_timeout': int, 'site_name': str,
'site_domain': (str, type(None)), 'show_github_link': bool, 'secret_key': str, 'site_domain': (str, type(None)), 'show_github_link': bool, 'secret_key': str,
'disable_api': bool, 'subdomain': (str, type(None)), 'latest': (str, type(None)) 'disable_api': bool, 'subdomain': (str, type(None)), 'latest': (str, type(None)), 'selflinks': bool
} }
for option in req_options.keys(): for option in req_options.keys():
@ -72,6 +72,10 @@ def check_short_exist(short): # Allow to also check against a long link
return True return True
return False return False
def check_self_link(long):
if get_baseUrl().rstrip('/') in long:
return True
return False
def check_password(password, pass_config): def check_password(password, pass_config):
if pass_config['password_hashed']: if pass_config['password_hashed']:
@ -257,6 +261,9 @@ def main_post():
return response(request, None, return response(request, None,
'Short URL already taken') 'Short URL already taken')
long_exists = check_long_exist(request.form['long']) long_exists = check_long_exist(request.form['long'])
if check_self_link(request.form['long']) and not current_app.config['selflinks']:
return response(request, None,
'You cannot link to this site')
if long_exists and not request.form.get('short'): if long_exists and not request.form.get('short'):
set_latest(request.form['long']) set_latest(request.form['long'])
get_db().commit() get_db().commit()