{"id":21456,"url":"https://patchwork.libcamera.org/api/patches/21456/?format=json","web_url":"https://patchwork.libcamera.org/patch/21456/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20241001102810.479285-10-mzamazal@redhat.com>","date":"2024-10-01T10:28:01","name":"[v5,09/15] config: Look up IPA configurables in configuration file","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d8a212573666b75e53a0dad827b4d92a214b0342","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21456/mbox/","series":[{"id":4644,"url":"https://patchwork.libcamera.org/api/series/4644/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4644","date":"2024-10-01T10:27:52","name":"Add global configuration file","version":5,"mbox":"https://patchwork.libcamera.org/series/4644/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21456/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21456/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 1766DC3263\n\tfor ;\n\tTue, 1 Oct 2024 10:28:50 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8C9D06353B;\n\tTue, 1 Oct 2024 12:28:49 +0200 (CEST)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C5F486352F\n\tfor ;\n\tTue, 1 Oct 2024 12:28:38 +0200 (CEST)","from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-561-gAdycj6oM6yrgJ96fh347w-1;\n\tTue, 01 Oct 2024 06:28:34 -0400","from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (unknown\n\t[10.30.177.40])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id E07631919626; Tue, 1 Oct 2024 10:28:33 +0000 (UTC)","from nuthatch.brq.redhat.com (unknown [10.43.17.37])\n\tby mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 57D9F1956054; Tue, 1 Oct 2024 10:28:32 +0000 (UTC)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"Ov4rB8+O\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1727778517;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=+fe/QlJBTO6v4Su52Wv3stkBmde3H2Wn2FeDTGKcosw=;\n\tb=Ov4rB8+OwU2CxjZNMJ4ECAwBaQz4/zmPTEmQU3NuqX6Ynubm9pBCoQsuMQTjUQ5KG12P7X\n\tAhLDNOzR2d1eeiKrI93+DFCnjb6/Y3Nx/A/1HM+ALhwkrab+2dGBESjnJT0cVvtkFqhJs4\n\thPesWAhSTGPPR+nDzjoAAuKKPl1mplI=","X-MC-Unique":"gAdycj6oM6yrgJ96fh347w-1","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ,\n\tKieran Bingham ,\n\tNaushir Patuck ","Subject":"[PATCH v5 09/15] config: Look up IPA configurables in configuration\n\tfile","Date":"Tue, 1 Oct 2024 12:28:01 +0200","Message-ID":"<20241001102810.479285-10-mzamazal@redhat.com>","In-Reply-To":"<20241001102810.479285-1-mzamazal@redhat.com>","References":"<20241001102810.479285-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.40","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"redhat.com","Content-Transfer-Encoding":"8bit","Content-Type":"text/plain; charset=\"US-ASCII\"; x-default=true","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The configuration snippet:\n\n configuration:\n ipa:\n config_paths: CONFIG:PATHS:...\n module_paths: MODULE:PATHS:...\n force_isolation: BOOL\n\nSigned-off-by: Milan Zamazal \n---\n src/libcamera/ipa_manager.cpp | 11 ++++++++---\n src/libcamera/ipa_proxy.cpp | 16 +++++++++++-----\n 2 files changed, 19 insertions(+), 8 deletions(-)","diff":"diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\nindex 33ae74e8f..566dc1402 100644\n--- a/src/libcamera/ipa_manager.cpp\n+++ b/src/libcamera/ipa_manager.cpp\n@@ -114,8 +114,11 @@ IPAManager::IPAManager()\n \tunsigned int ipaCount = 0;\n \n \t/* User-specified paths take precedence. */\n-\tconst char *modulePaths = utils::secure_getenv(\"LIBCAMERA_IPA_MODULE_PATH\");\n-\tif (modulePaths) {\n+\tconst auto confModulePaths =\n+\t\tGlobalConfiguration::envOption(\n+\t\t\t\"LIBCAMERA_IPA_MODULE_PATH\", \"ipa.module_paths\");\n+\tif (confModulePaths.has_value()) {\n+\t\tconst char *modulePaths = confModulePaths.value().c_str();\n \t\tfor (const auto &dir : utils::split(modulePaths, \":\")) {\n \t\t\tif (dir.empty())\n \t\t\t\tcontinue;\n@@ -289,7 +292,9 @@ bool IPAManager::isSignatureValid([[maybe_unused]] IPAModule *ipa) const\n {\n #if HAVE_IPA_PUBKEY\n \tchar *force = utils::secure_getenv(\"LIBCAMERA_IPA_FORCE_ISOLATION\");\n-\tif (force && force[0] != '\\0') {\n+\tif ((force && force[0] != '\\0') ||\n+\t (!force && GlobalConfiguration::option(\"ipa.force_isolation\")\n+\t\t\t .value_or(false))) {\n \t\tLOG(IPAManager, Debug)\n \t\t\t<< \"Isolation of IPA module \" << ipa->path()\n \t\t\t<< \" forced through environment variable\";\ndiff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp\nindex 85004737c..787d58019 100644\n--- a/src/libcamera/ipa_proxy.cpp\n+++ b/src/libcamera/ipa_proxy.cpp\n@@ -14,6 +14,7 @@\n #include \n #include \n \n+#include \"libcamera/internal/global_configuration.h\"\n #include \"libcamera/internal/ipa_module.h\"\n \n /**\n@@ -108,8 +109,11 @@ std::string IPAProxy::configurationFile(const std::string &name,\n \tstd::string ipaName = ipam_->info().name;\n \n \t/* Check the environment variable first. */\n-\tconst char *confPaths = utils::secure_getenv(\"LIBCAMERA_IPA_CONFIG_PATH\");\n-\tif (confPaths) {\n+\tauto confConfPaths =\n+\t\tGlobalConfiguration::envOption(\n+\t\t\t\"LIBCAMERA_IPA_CONFIG_PATH\", \"ipa.config_paths\");\n+\tif (confConfPaths.has_value()) {\n+\t\tconst char *confPaths = confConfPaths.value().c_str();\n \t\tfor (const auto &dir : utils::split(confPaths, \":\")) {\n \t\t\tif (dir.empty())\n \t\t\t\tcontinue;\n@@ -183,9 +187,11 @@ std::string IPAProxy::resolvePath(const std::string &file) const\n \tstd::string proxyFile = \"/\" + file;\n \n \t/* Check env variable first. */\n-\tconst char *execPaths = utils::secure_getenv(\"LIBCAMERA_IPA_PROXY_PATH\");\n-\tif (execPaths) {\n-\t\tfor (const auto &dir : utils::split(execPaths, \":\")) {\n+\tconst auto execPaths =\n+\t\tGlobalConfiguration::envOption(\n+\t\t\t\"LIBCAMERA_IPA_PROXY_PATH\", \"ipa.proxy_paths\");\n+\tif (execPaths.has_value()) {\n+\t\tfor (const auto &dir : utils::split(execPaths.value().c_str(), \":\")) {\n \t\t\tif (dir.empty())\n \t\t\t\tcontinue;\n \n","prefixes":["v5","09/15"]}