Skip to content

Fix #158 by adding token_verification_enabled option to App #180

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

Merged
seratch merged 1 commit into from
Dec 18, 2020
Merged

Fix #158 by adding token_verification_enabled option to App #180

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
12 changes: 9 additions & 3 deletions slack_bolt/app/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def __init__(
signing_secret: Optional[str] = None,
# for single-workspace apps
token: Optional[str] = None,
token_verification_enabled: bool = True,
client: Optional[WebClient] = None,
# for multi-workspace apps
authorize: Optional[Callable[..., AuthorizeResult]] = None,
Expand All @@ -95,6 +96,7 @@ def __init__(
:param process_before_response: True if this app runs on Function as a Service. (Default: False)
:param signing_secret: The Signing Secret value used for verifying requests from Slack.
:param token: The bot access token required only for single-workspace app.
:param token_verification_enabled: Verifies the validity of the given token if True.
:param client: The singleton slack_sdk.WebClient instance for this app.
:param authorize: The function to authorize an incoming request from Slack
by checking if there is a team/user in the installation data.
Expand Down Expand Up @@ -227,9 +229,11 @@ def __init__(
)

self._init_middleware_list_done = False
self._init_middleware_list()
self._init_middleware_list(
token_verification_enabled=token_verification_enabled
)

def _init_middleware_list(self):
def _init_middleware_list(self, token_verification_enabled: bool):
if self._init_middleware_list_done:
return
self._middleware_list.append(
Expand All @@ -240,7 +244,9 @@ def _init_middleware_list(self):
if self._oauth_flow is None:
if self._token is not None:
try:
auth_test_result = self._client.auth_test(token=self._token)
auth_test_result = None
if token_verification_enabled:
auth_test_result = self._client.auth_test(token=self._token)
self._middleware_list.append(
SingleTeamAuthorization(auth_test_result=auth_test_result)
)
Expand Down
14 changes: 14 additions & 0 deletions tests/scenario_tests/test_app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,20 @@ def test_token_absence(self):
with pytest.raises(BoltError):
App(signing_secret="valid", token="")

def test_token_verification_enabled_False(self):
App(
signing_secret="valid",
client=self.web_client,
token_verification_enabled=False,
)
App(
signing_secret="valid",
token="xoxb-invalid",
token_verification_enabled=False,
)

assert self.mock_received_requests.get("/auth.test") is None

# --------------------------
# multi teams auth
# --------------------------
Expand Down