Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions flag_cleanup.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import os
import requests
from urllib.parse import urlparse, urlunparse
from github import Github
from harness_scm import HarnessSCM, Repo
from piranha_classes import PolyglotPiranha, JavascriptPiranha
import git
import secrets
import string
from security import safe_requests

def generate_random_id_string(length=6):
characters = string.ascii_letters + string.digits
Expand All @@ -33,7 +33,7 @@ def get_flag_data(api_key, base_url, account_id, org_identifier, project_identif
base_url, account_id, project_identifier, account_id, org_identifier, environment_identifier)
headers = {"x-api-key": api_key}
try:
response = requests.get(url, params={}, headers=headers)
response = safe_requests.get(url, params={}, headers=headers)
except Exception as e:
print(f"Error getting flag data: {e}")
return {}
Expand All @@ -50,7 +50,7 @@ def get_env(api_key, base_url, account_id, org_identifier, project_identifier):
url = f"https://{base_url}/gateway/cf/admin/environments?accountIdentifier={account_id}&orgIdentifier={org_identifier}&projectIdentifier={project_identifier}"
headers = {"x-api-key": api_key}
try:
response = requests.get(url, params={}, headers=headers)
response = safe_requests.get(url, params={}, headers=headers)
except Exception as e:
print(f"Error getting environment: {e}")
return env
Expand Down Expand Up @@ -217,4 +217,4 @@ def get_repo_name_from_remote_url(url):
except Exception as e:
print(f"Error creating pull request: {e}")
else:
raise Exception("Nothing to commit, so no Pull Request")
raise Exception("Nothing to commit, so no Pull Request")
3 changes: 2 additions & 1 deletion harness_scm.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import requests
from security import safe_requests


class HarnessSCM:
Expand All @@ -15,7 +16,7 @@ def get_repo(self, repo_id, account_id, project_id, **kwargs):
headers = {
'x-api-key': self.token
}
response = requests.get(endpoint, headers=headers)
response = safe_requests.get(endpoint, headers=headers)
if response.status_code == 200:
return Repo(self.token, response.json())
else:
Expand Down