From patchwork Thu Apr 10 10:24:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jaeyoon.jung@lge.com X-Patchwork-Id: 61108 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25C65C3601E for ; Thu, 10 Apr 2025 10:24:40 +0000 (UTC) Received: from lgeamrelo11.lge.com (lgeamrelo11.lge.com [156.147.23.51]) by mx.groups.io with SMTP id smtpd.web10.30787.1744280673762653877 for ; Thu, 10 Apr 2025 03:24:34 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: lge.com, ip: 156.147.23.51, mailfrom: jaeyoon.jung@lge.com) Received: from unknown (HELO lgeamrelo01.lge.com) (156.147.1.125) by 156.147.23.51 with ESMTP; 10 Apr 2025 19:24:31 +0900 X-Original-SENDERIP: 156.147.1.125 X-Original-MAILFROM: jaeyoon.jung@lge.com Received: from unknown (HELO magneto.lge.net) (10.177.121.44) by 156.147.1.125 with ESMTP; 10 Apr 2025 19:24:31 +0900 X-Original-SENDERIP: 10.177.121.44 X-Original-MAILFROM: jaeyoon.jung@lge.com From: jaeyoon.jung@lge.com To: openembedded-core@lists.openembedded.org Cc: Jaeyoon Jung Subject: [PATCH] send-error-report: Respect URL scheme in server name if exists Date: Thu, 10 Apr 2025 19:24:01 +0900 Message-ID: <20250410102401.122070-1-jaeyoon.jung@lge.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 10 Apr 2025 10:24:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214640 From: Jaeyoon Jung 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. Signed-off-by: Jaeyoon Jung --- scripts/send-error-report | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/scripts/send-error-report b/scripts/send-error-report index cfbcaa52cb..1e973f1cb2 100755 --- a/scripts/send-error-report +++ b/scripts/send-error-report @@ -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 the environment variable + 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)