public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Felix Moessbauer <felix.moessbauer@siemens.com>
To: isar-users@googlegroups.com
Cc: adriaan.schmidt@siemens.com,
	Felix Moessbauer <felix.moessbauer@siemens.com>
Subject: [PATCH 7/7] signatures: do not expand SRC_URI
Date: Wed,  4 May 2022 13:41:09 +0200	[thread overview]
Message-ID: <20220504114109.3411005-8-felix.moessbauer@siemens.com> (raw)
In-Reply-To: <20220504114109.3411005-1-felix.moessbauer@siemens.com>

This patch reworks modification to SRC_URI to avoid expanding
the variables in the string. By that, both cachability issues,
as well as information leaks (e.g. repo access tokens) are
mitigated.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta/classes/dpkg-base.bbclass     | 2 +-
 meta/classes/dpkg-prebuilt.bbclass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 86933c57..163d678b 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -81,7 +81,7 @@ SRC_APT ?= ""
 
 # filter out all "apt://" URIs out of SRC_URI and stick them into SRC_APT
 python() {
-    src_uri = (d.getVar('SRC_URI') or "").split()
+    src_uri = (d.getVar('SRC_URI', False) or "").split()
 
     prefix = "apt://"
     new_src_uri = []
diff --git a/meta/classes/dpkg-prebuilt.bbclass b/meta/classes/dpkg-prebuilt.bbclass
index c32224bb..0a6daef7 100644
--- a/meta/classes/dpkg-prebuilt.bbclass
+++ b/meta/classes/dpkg-prebuilt.bbclass
@@ -7,7 +7,7 @@ inherit dpkg-base
 
 python do_unpack_prepend() {
     # enforce unpack=false
-    src_uri = (d.getVar('SRC_URI', True) or '').split()
+    src_uri = (d.getVar('SRC_URI', False) or '').split()
     if len(src_uri) == 0:
         return
     def ensure_unpack_false(uri):
-- 
2.30.2


  parent reply	other threads:[~2022-05-04 11:41 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-04 11:41 [PATCH 0/7] Further improve cachability of ISAR Felix Moessbauer
2022-05-04 11:41 ` [PATCH 1/7] signatures: exclude path to core layer from bb hashes Felix Moessbauer
2022-05-04 11:41 ` [PATCH 2/7] signatures: whitelist external SCRIPTSDIR Felix Moessbauer
2022-05-04 11:41 ` [PATCH 3/7] signatures: exclude BITBAKEDIR from WIC Felix Moessbauer
2022-05-04 11:41 ` [PATCH 4/7] signatures: use TOPDIR instead of BUILDDIR in wic Felix Moessbauer
2022-05-04 11:41 ` [PATCH 5/7] signatures: unify WKS_* variable exclusions with OE Felix Moessbauer
2022-05-04 11:41 ` [PATCH 6/7] signatures: exclude TOPDIR from signatures Felix Moessbauer
2022-05-04 11:41 ` Felix Moessbauer [this message]
2022-05-16  9:29 ` [PATCH 0/7] Further improve cachability of ISAR Anton Mikanovich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220504114109.3411005-8-felix.moessbauer@siemens.com \
    --to=felix.moessbauer@siemens.com \
    --cc=adriaan.schmidt@siemens.com \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox