Skip to content

[GRDM-62705] ENABLE_TIMESTAMP = False でタイムスタンプ局へのリクエストを完全に停止できるように修正 #783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yacchin1205 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[GRDM-62705] ENABLE_TIMESTAMP = False でタイムスタンプ局へのリクエストを完全に停止できるように修正 #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions tests/test_timestamp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,3 +646,18 @@ def test_ready_raise_attribute_error(self, mock_ready, mock_logger):
nt.assert_true(task.ready())
mock_logger.error.assert_any_call('Failed to get task status! Exception message:')
mock_logger.error.assert_any_call(msg)


class TestEnableTimestampGuard(OsfTestCase):
"""When ENABLE_TIMESTAMP is False, add_token and check_file_timestamp must
return immediately, so that no request is sent to the timestamp authority.
"""

@mock.patch('website.util.timestamp.settings.ENABLE_TIMESTAMP', False)
def test_add_token_disabled(self):
# Args are never touched when the guard is effective.
nt.assert_is_none(timestamp.add_token(None, None, None))

@mock.patch('website.util.timestamp.settings.ENABLE_TIMESTAMP', False)
def test_check_file_timestamp_disabled(self):
nt.assert_is_none(timestamp.check_file_timestamp(None, None, None))
4 changes: 4 additions & 0 deletions website/util/timestamp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@ def get_full_list(uid, pid, node):
return provider_list

def check_file_timestamp(uid, node, data, verify_external_only=False):
if not settings.ENABLE_TIMESTAMP:
return None
user = OSFUser.objects.get(id=uid)
file_node = BaseFileNode.objects.get(_id=data['file_id'])
if not userkey_generation_check(user._id):
Expand Down Expand Up @@ -525,6 +527,8 @@ def cancel_celery_task(node):
return result

def add_token(uid, node, data):
if not settings.ENABLE_TIMESTAMP:
return None
try:
user = OSFUser.objects.get(id=uid)
file_node = BaseFileNode.objects.get(_id=data['file_id'])
Expand Down
Loading