Skip to content

Commit 9151e3f

Browse files
committed
feat: Change logger to include full rquest path
1 parent c21a734 commit 9151e3f

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

src/helpers.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""Helpers Module"""
22
import datetime
3+
import re
34
import base64
45
import argparse
56
from concurrent.futures import ThreadPoolExecutor
@@ -27,6 +28,15 @@ def decode_base64(value):
2728
return base64.b64decode(value).decode("utf-8")
2829

2930

31+
def redact_token(uri):
32+
"""Redacts the 'token' value from the URI
33+
34+
Returns:
35+
uri: token=<REDACTED>
36+
"""
37+
return re.sub(r'(\?|&)token=.*?(&|$)', r'\1token=<REDACTED>\2', uri)
38+
39+
3040
def get_token():
3141
"""Sets the GitHub API token based on the selected mode
3242

src/routes.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import requests
77
from flask import Flask, request, make_response, jsonify
88
from flask_basicauth import BasicAuth
9-
from helpers import get_token, get_all_workflow_runs
9+
from helpers import get_token, get_all_workflow_runs, redact_token
1010
from config import BASIC_AUTH_USERNAME, BASIC_AUTH_PASSWORD, TIMEOUT
1111

1212
logging.basicConfig(level=logging.INFO)
@@ -74,7 +74,7 @@ def index():
7474
response.headers['Content-Type'] = 'application/xml'
7575

7676
logger.info("Request URI: %s Response Code: %d",
77-
request.path, response.status_code)
77+
redact_token(request.full_path), response.status_code)
7878

7979
return response
8080

@@ -154,6 +154,7 @@ def handle_error(exception):
154154
Returns:
155155
str: The error message response.
156156
"""
157-
logger.error("An error occurred: %s", str(exception))
157+
logger.error("An error occurred: %s Request URI: %s", str(exception),
158+
redact_token(request.full_path))
158159
error_message = f"An error occurred: {str(exception)}"
159160
return error_message, 500

0 commit comments

Comments
 (0)