Infra #7366 - update modernpaste date hack to fail the request if the given expiry is beyond a week, rather than silently setting it to a week without notifying the user.
Signed-off-by: Rick Elrod <relrod@redhat.com>
This commit is contained in:
parent
c96327ccfe
commit
7e75ceb541
1 changed files with 17 additions and 1 deletions
|
@ -50,12 +50,28 @@ def submit_paste():
|
||||||
constants.api.PASTE_ATTACHMENT_TOO_LARGE_FAILURE_CODE,
|
constants.api.PASTE_ATTACHMENT_TOO_LARGE_FAILURE_CODE,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
expire_hardcode = (datetime.datetime.now() + datetime.timedelta(weeks=1)).strftime('%s')
|
||||||
|
expiry_time_given = data.get('expiry_time')
|
||||||
|
if expiry_time_given:
|
||||||
|
if int(expiry_time_given) > int(expire_hardcode):
|
||||||
|
return (
|
||||||
|
flask.jsonify(
|
||||||
|
{ 'success': False,
|
||||||
|
'message': 'Pastes can only have an expiry of one week.',
|
||||||
|
'failure': 'paste_expiry_too_far_failure'
|
||||||
|
}
|
||||||
|
),
|
||||||
|
400
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
expire_hardcode = expiry_time_given
|
||||||
|
|
||||||
try:
|
try:
|
||||||
new_paste = database.paste.create_new_paste(
|
new_paste = database.paste.create_new_paste(
|
||||||
contents=data.get('contents'),
|
contents=data.get('contents'),
|
||||||
user_id=current_user.user_id if current_user.is_authenticated else None,
|
user_id=current_user.user_id if current_user.is_authenticated else None,
|
||||||
#expiry_time=data.get('expiry_time'),
|
#expiry_time=data.get('expiry_time'),
|
||||||
expiry_time=(datetime.datetime.now() + datetime.timedelta(weeks=1)).strftime('%s'),
|
expiry_time=expire_hardcode,
|
||||||
title=data.get('title'),
|
title=data.get('title'),
|
||||||
language=data.get('language'),
|
language=data.get('language'),
|
||||||
password=data.get('password'),
|
password=data.get('password'),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue