MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-05 05:04:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

send-error-report: Respect URL scheme in server name if exists

Browse Source 
If a server name with -s or --server flag contains the URL scheme such
as http:// or https:// it takes precedence over --no-ssl flag. This will
allow us to use the same command line option for different servers with
http:// and https:// schemes mixed.

(From OE-Core rev: e8ce179cf5d82b41bdf7f05013c1b6d58001c336)

Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jaeyoon Jung 2025-04-14 11:41:10 +09:00 committed by Richard Purdie
parent 35807e8f63
commit 4edf8615a6
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/send-error-report
View File

@ -65,7 +65,7 @@ def edit_content(json_file_path):
def prepare_data(args):
# attempt to get the max_log_size from the server's settings
max_log_size = getPayloadLimit(args.protocol+args.server+"/ClientPost/JSON")
max_log_size = getPayloadLimit(args.server+"/ClientPost/JSON")
if not os.path.isfile(args.error_file):
log.error("No data file found.")
@ -135,9 +135,9 @@ def send_data(data, args):
headers={'Content-type': 'application/json', 'User-Agent': "send-error-report/"+version}
if args.json:
url = args.protocol+args.server+"/ClientPost/JSON/"
url = args.server+"/ClientPost/JSON/"
else:
url = args.protocol+args.server+"/ClientPost/"
url = args.server+"/ClientPost/"
req = urllib.request.Request(url, data=data, headers=headers)
try:
@ -149,6 +149,23 @@ def send_data(data, args):
print(response.read().decode('utf-8'))
def determine_server_url(args):
# Get the error report server from an argument
server = args.server or 'errors.yoctoproject.org'
# The scheme contained in the given URL takes precedence over --no-ssl flag
scheme = args.protocol
if server.startswith('http://'):
server = server[len('http://'):]
scheme = 'http://'
elif server.startswith('https://'):
server = server[len('https://'):]
scheme = 'https://'
# Construct the final URL
return f"{scheme}{server}"
if __name__ == '__main__':
arg_parse = argparse_oe.ArgumentParser(description="This scripts will send an error report to your specified error-report-web server.")
@ -164,8 +181,7 @@ if __name__ == '__main__':
arg_parse.add_argument("-s",
"--server",
help="Server to send error report to",
type=str,
default="errors.yoctoproject.org")
type=str)
arg_parse.add_argument("-e",
"--email",
@ -195,10 +211,10 @@ if __name__ == '__main__':
dest="protocol",
action="store_const", const="http://", default="https://")
args = arg_parse.parse_args()
args.server = determine_server_url(args)
if (args.json == False):
print("Preparing to send errors to: "+args.server)