Skip to content

Add dependency/SBOM criteria and releveling#163

Closed
puerco wants to merge 24 commits intoossf:mainfrom
puerco:sbom-criteria
Closed

Add dependency/SBOM criteria and releveling#163
puerco wants to merge 24 commits intoossf:mainfrom
puerco:sbom-criteria

Conversation

@puerco
Copy link
Member

@puerco puerco commented Jan 24, 2025

This commit updates the dependency criteria to add increasing transparency requirements at each level:

  1. Checked in language-native dependency list
  2. Simple SBOM
  3. SBOM with NTIA/CRA data fields

In addition to the two new ones, OSPS-QA-03 is simplified and releveled to 1.

Signed-off-by: Adolfo García Veytia (Puerco) adolfo.garcia@uservers.net

Copy link
Contributor

@SecurityCRob SecurityCRob left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i need to adjust the xls to account for this change, but +1

Comment on lines +77 to +78
language dependency lock file that ennumerates all
direct and transitive dependencies such as
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Details says "direct and transitive" but criteria says "direct". Which do we require here?

@puerco
Copy link
Member Author

puerco commented Jan 24, 2025

i need to adjust the xls to account for this change,

@SecurityCRob I'm happy to add it to the spreadsheet.
Note that OSPS-QA-11 & OSPS-QA-12 match SSDF PS3, PW4. OSPS-QA-03 is cross referenced to SSDF PO4 and PS1. I think those are not correct, but I didn't want to mess with your original assessment.

Copy link
Contributor

@eddie-knight eddie-knight left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed that the first entry needs to be changed to follow our criterion format

@puerco puerco enabled auto-merge (squash) January 24, 2025 23:59
This commit updates the dependency criteria to add
increasing transparency requirements at each level.

Signed-off-by: Adolfo García Veytia (Puerco) <adolfo.garcia@uservers.net>
Copy link
Contributor

@funnelfiasco funnelfiasco left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should soften the language in the rationale/details to make it clear that what we're looking for in this criterion is enumeration, not pinning.

On the other hand, if we do want to require some form of pinning at level 1, we need to

  1. Update the criterion text to include that
  2. Specify what sort of pinning is sufficient (e.g. minimum version, branch/release name, specific version, hash, etc etc etc)

For clarity: my strong preference is to go with the first approach and focus on enumeration at level 1.

@SecurityCRob
Copy link
Contributor

i need to adjust the xls to account for this change,

@SecurityCRob I'm happy to add it to the spreadsheet. Note that OSPS-QA-11 & OSPS-QA-12 match SSDF PS3, PW4. OSPS-QA-03 is cross referenced to SSDF PO4 and PS1. I think those are not correct, but I didn't want to mess with your original assessment.

I'll figure this out today, no worries!

SecurityCRob and others added 2 commits January 27, 2025 09:50
Co-authored-by: Ben Cotton <bcotton@funnelfiasco.com>
Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>
Co-authored-by: Ben Cotton <bcotton@funnelfiasco.com>
Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>
evankanderson and others added 2 commits January 28, 2025 12:37
Signed-off-by: Evan Anderson <evan@stacklok.com>
* Enhancement of SA rationales and implementation details

<title>

Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>

* Update baseline/OSPS-SA.yaml

Co-authored-by: Puerco <puerco@users.noreply.github.com>
Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>

* Update baseline/OSPS-SA.yaml

Co-authored-by: Puerco <puerco@users.noreply.github.com>
Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>

* Moved some content into lexicon entries

Signed-off-by: Eddie Knight <knight@linux.com>

* Update baseline/OSPS-SA.yaml

Co-authored-by: Ben Cotton <ben@kusari.dev>
Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>

---------

Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>
Signed-off-by: Eddie Knight <knight@linux.com>
Co-authored-by: Puerco <puerco@users.noreply.github.com>
Co-authored-by: Eddie Knight <knight@linux.com>
Co-authored-by: Ben Cotton <ben@kusari.dev>
eddie-knight and others added 5 commits February 3, 2025 13:27
Co-authored-by: Eleftheria Stein-Kousathana <eleftheria.kousathana@gmail.com>
Signed-off-by: Eddie Knight <knight@linux.com>
suggested update to QA-12

Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>
better update than the last one

Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>
an even better update than the last two

Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>
* Add a maintenance process

Signed-off-by: Ben Cotton <ben@kusari.dev>

* Remove "Scorecard/Insights values" from allowed changes

Co-authored-by: Eddie Knight <knight@linux.com>
Signed-off-by: Ben Cotton <bcotton@funnelfiasco.com>

* Update the examples to use our CalVer scheme

And also comment them out so that they aren't rendered until there are
actual things to put there.

Signed-off-by: Ben Cotton <ben@kusari.dev>

* Reflect new numbering system

Signed-off-by: Ben Cotton <ben@kusari.dev>

* Correct wording per ossf#175

Co-authored-by: Eddie Knight <knight@linux.com>
Signed-off-by: Ben Cotton <bcotton@funnelfiasco.com>

---------

Signed-off-by: Ben Cotton <ben@kusari.dev>
Signed-off-by: Ben Cotton <bcotton@funnelfiasco.com>
Co-authored-by: Eddie Knight <knight@linux.com>
funnelfiasco and others added 2 commits February 4, 2025 10:45
Signed-off-by: Ben Cotton <ben@kusari.dev>
Signed-off-by: Eddie Knight <knight@linux.com>
SecurityCRob and others added 11 commits February 5, 2025 16:36
* Update lexicon.yaml with control mappings

add control mapping references

Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>

* Update baseline/lexicon.yaml

Co-authored-by: Eddie Knight <knight@linux.com>
Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>

* Update lexicon.yaml

tweaked ssdf

Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>

* Update lexicon.yaml

now with 100% MOAR SBOM!

Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>

* Fix yaml formatting

Signed-off-by: Ben Cotton <ben@kusari.dev>

* Apply suggestions from code review

Co-authored-by: Puerco <puerco@users.noreply.github.com>
Signed-off-by: Eddie Knight <knight@linux.com>

---------

Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>
Signed-off-by: Ben Cotton <ben@kusari.dev>
Signed-off-by: Eddie Knight <knight@linux.com>
Co-authored-by: Eddie Knight <knight@linux.com>
Co-authored-by: Ben Cotton <ben@kusari.dev>
Co-authored-by: Puerco <puerco@users.noreply.github.com>
Signed-off-by: Ben Cotton <ben@kusari.dev>
Signed-off-by: Ben Cotton <ben@kusari.dev>
Co-authored-by: David A. Wheeler <dwheeler@dwheeler.com>
Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>
Co-authored-by: David A. Wheeler <dwheeler@dwheeler.com>
Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>
Co-authored-by: David A. Wheeler <dwheeler@dwheeler.com>
Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>
Co-authored-by: Eleftheria Stein-Kousathana <eleftheria.kousathana@gmail.com>
Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>
updated 03 mappings

Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>
Signed-off-by: Eddie Knight <knight@linux.com>
updates to qa03 & 11

Signed-off-by: CRob <69357996+SecurityCRob@users.noreply.github.com>
@eddie-knight
Copy link
Contributor

This PR history has gone sideways, and the fix seems more complex than is worthwhile at the moment. I've copied these commits to a new branch and PR.

auto-merge was automatically disabled February 14, 2025 15:49

Pull request was closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants