Skip to content

Swarming: Fix double base64 encoding of secret_bytes in swarming tasks #5249

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
IvanBM18 wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −10
Open

Swarming: Fix double base64 encoding of secret_bytes in swarming tasks #5249

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
2 changes: 1 addition & 1 deletion src/clusterfuzz/_internal/swarming/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ def create_new_task_request(command: str, job_name: str, download_url: str
execution_timeout_secs=execution_timeout_secs,
env=swarming_bot_environment,
env_prefixes=env_prefixes,
secret_bytes=base64.b64encode(download_url.encode('utf-8'))))
secret_bytes=download_url.encode('utf-8')))
])

return new_task_request
Expand Down
13 changes: 4 additions & 9 deletions src/clusterfuzz/_internal/tests/core/swarming/swarming_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
"""Swarming tests."""
import base64
import os
import unittest
from unittest import mock
Expand Down Expand Up @@ -106,8 +105,7 @@ def test_get_spec_from_config_with_docker_image(self):
'"IS_K8S_ENV": "True", "DISABLE_MOUNTS": "True", '
'"LOGGING_CLOUD_PROJECT_ID": "project_id"}')),
],
secret_bytes=base64.b64encode(
'https://download_url'.encode('utf-8'))))
secret_bytes='https://download_url'.encode('utf-8')))
])
self.assertEqual(spec, expected_spec)

Expand Down Expand Up @@ -191,8 +189,7 @@ def test_get_spec_from_config_without_docker_image(self):
'package_install_path/bin'
])
],
secret_bytes=base64.b64encode(
'https://download_url'.encode('utf-8'))))
secret_bytes='https://download_url'.encode('utf-8')))
])
self.assertEqual(spec, expected_spec)

Expand Down Expand Up @@ -251,8 +248,7 @@ def test_get_spec_from_config_for_fuzz_task(self):
'"IS_K8S_ENV": "True", "DISABLE_MOUNTS": "True", '
'"LOGGING_CLOUD_PROJECT_ID": "project_id"}')),
],
secret_bytes=base64.b64encode(
'https://download_url'.encode('utf-8'))))
secret_bytes='https://download_url'.encode('utf-8')))
])
self.assertEqual(spec, expected_spec)

Expand Down Expand Up @@ -317,8 +313,7 @@ def test_push_swarming_task(self):
'"IS_K8S_ENV": "True", "DISABLE_MOUNTS": "True", '
'"LOGGING_CLOUD_PROJECT_ID": "project_id"}')),
],
secret_bytes=base64.b64encode(
'https://download_url'.encode('utf-8'))))
secret_bytes='https://download_url'.encode('utf-8')))
])

self.mock.get_scoped_service_account_credentials.assert_called_with(
Expand Down
Loading