Skip to content

Commit 5c41e12

Browse files
authored
content: Release SLSA 1.2 (#1516)
This PR marks the official release of SLSA 1.2, retiring SLSA 1.1 and SLSA 1.2 RC2. It should not be merged until Monday November 24th at the earliest and even then only if we've received no significant feedback on RC2. I've tried [this method](https://stackoverflow.com/questions/16937359/git-copy-file-preserving-history) of retaining history when making copies to make it easier to understand the changes made, but it didn't seem to work (as evidenced by the diffs in this PR). I've had good success using meld to understand the differences introduced. E.g. `meld docs/spec/v1.2-rc2 docs/spec/v1.2`. This method shows only 3 files differing between v1.2-rc2 and v1.2: index.md, onepage.md, and whats-new.md. Per @lehors's suggestion this also removes SLSA 1.0 from the nav bar (but it remains accessible). refs #1515 --------- Signed-off-by: Tom Hennen <[email protected]>
1 parent 66c09ca commit 5c41e12

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+6655
-135
lines changed

docs/_data/nav/config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ url_to_key:
1313
v1.1: v11
1414
v1.2-rc1: v12-rc1
1515
v1.2-rc2: v12-rc2
16+
v1.2: v12
1617
v1: v11
17-
latest: v11
18+
latest: v12
1819

1920
# TODO: when viewing spec v0.1, it would be better to link to attestations v0.2.
2021
# Not sure how to implement that though.

docs/_data/nav/main.yml

Lines changed: 26 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
url: /current-activities
99
description: What the SLSA community is currently working on
1010

11-
- title: SLSA v1.2 RC2
12-
url: /spec/v1.2-rc2/
11+
- title: SLSA v1.2
12+
url: /spec/v1.2/
1313
children:
1414

1515
- title: Understanding SLSA
@@ -20,35 +20,35 @@
2020
children:
2121

2222
- title: What's new
23-
url: /spec/v1.2-rc2/whats-new
23+
url: /spec/v1.2/whats-new
2424
description: The changes brought by this revision of SLSA.
2525

2626
- title: About SLSA
27-
url: /spec/v1.2-rc2/about
27+
url: /spec/v1.2/about
2828
description: An introductory guide to SLSA
2929

3030
- title: Supply chain threats
31-
url: /spec/v1.2-rc2/threats-overview
31+
url: /spec/v1.2/threats-overview
3232
description: An introduction to supply chain threats
3333

3434
- title: Use cases
35-
url: /spec/v1.2-rc2/use-cases
35+
url: /spec/v1.2/use-cases
3636
description: Use cases
3737

3838
- title: Guiding principles
39-
url: /spec/v1.2-rc2/principles
39+
url: /spec/v1.2/principles
4040
description: Use cases
4141

4242
- title: FAQ
43-
url: /spec/v1.2-rc2/faq
43+
url: /spec/v1.2/faq
4444
description: Questions and more information
4545

4646
- title: Future directions
47-
url: /spec/v1.2-rc2/future-directions
47+
url: /spec/v1.2/future-directions
4848
description: Additions and changes being considered for future SLSA versions
4949

5050
- title: Tracks
51-
url: /spec/v1.2-rc2/tracks
51+
url: /spec/v1.2/tracks
5252
description: Provides an overview of each track and links to more specific information.
5353

5454
- title: Build Track
@@ -59,27 +59,27 @@
5959
children:
6060

6161
- title: Basics
62-
url: /spec/v1.2-rc2/build-track-basics
62+
url: /spec/v1.2/build-track-basics
6363
description: The SLSA build track is organized into a series of levels that provide increasing supply chain security guarantees. This gives you confidence that software hasn't been tampered with and can be securely traced back to its source. This page is a descriptive overview of the SLSA build track levels, describing their intent.
6464

6565
- title: Terminology
66-
url: /spec/v1.2-rc2/terminology
66+
url: /spec/v1.2/terminology
6767
description: Terminology and model used by SLSA
6868

6969
- title: Producing artifacts
70-
url: /spec/v1.2-rc2/build-requirements
70+
url: /spec/v1.2/build-requirements
7171
description: Detailed technical requirements for producing software artifacts, intended for platform implementers
7272

7373
- title: Distributing provenance
74-
url: /spec/v1.2-rc2/distributing-provenance
74+
url: /spec/v1.2/distributing-provenance
7575
description: Detailed technical requirements for distributing provenance, intended for platform implementers and software distributors
7676

7777
- title: Verifying artifacts
78-
url: /spec/v1.2-rc2/verifying-artifacts
78+
url: /spec/v1.2/verifying-artifacts
7979
description: Guidance for verifying software artifacts and their SLSA provenance, intended for platform implementers and software consumers
8080

8181
- title: Assessing build platforms
82-
url: /spec/v1.2-rc2/assessing-build-platforms
82+
url: /spec/v1.2/assessing-build-platforms
8383
description: Guidelines for securing SLSA Build L3+ builders, intended for platform implementers
8484

8585
- title: Source Track
@@ -90,27 +90,27 @@
9090
children:
9191

9292
- title: Producing source
93-
url: /spec/v1.2-rc2/source-requirements
93+
url: /spec/v1.2/source-requirements
9494
description: Overview of the Source track
9595

9696
- title: Verifying source
97-
url: /spec/v1.2-rc2/verifying-source
97+
url: /spec/v1.2/verifying-source
9898
description: Guidelines for verifying source provenance
9999

100100
- title: Assessing source control systems
101-
url: /spec/v1.2-rc2/assessing-source-systems
101+
url: /spec/v1.2/assessing-source-systems
102102
description: Guidelines for assessing source control system security.
103103

104104
- title: Example controls
105-
url: /spec/v1.2-rc2/source-example-controls
105+
url: /spec/v1.2/source-example-controls
106106
description: This page provides examples of additional controls that organizations may want to implement as they adopt the SLSA Source track.
107107

108108
- title: Cross Track Information
109109
description: These pages describe information that crosses track boundaries.
110110
children:
111111

112112
- title: Threats & mitigations
113-
url: /spec/v1.2-rc2/threats
113+
url: /spec/v1.2/threats
114114
description: Detailed information about specific supply chain attacks and how SLSA helps
115115

116116
- title: Attestation formats
@@ -121,23 +121,23 @@
121121
children:
122122

123123
- title: General model
124-
url: /spec/v1.2-rc2/attestation-model
124+
url: /spec/v1.2/attestation-model
125125
description: General attestation mode
126126

127127
- title: Provenance
128-
url: /spec/v1.2-rc2/provenance
128+
url: /spec/v1.2/provenance
129129
description: Provides a description of the concept of provenance and links to the various tracks specific definitions.
130130

131131
- title: Build Provenance
132-
url: /spec/v1.2-rc2/build-provenance
132+
url: /spec/v1.2/build-provenance
133133
description: Suggested build provenance format and explanation
134134

135135
- title: Verification Summary
136-
url: /spec/v1.2-rc2/verification_summary
136+
url: /spec/v1.2/verification_summary
137137
description: Suggested VSA format and explanation
138138

139139
- title: Single-page view
140-
url: /spec/v1.2-rc2/onepage
140+
url: /spec/v1.2/onepage
141141
skip_next_prev: true # don't show as a next/prev link
142142

143143
- title: SLSA v1.1
@@ -241,107 +241,6 @@
241241
url: /spec/v1.1/onepage
242242
skip_next_prev: true # don't show as a next/prev link
243243

244-
- title: SLSA v1.0
245-
description: >
246-
These pages describe SLSA's security levels and requirements for each track.
247-
If you want to achieve SLSA a particular level, these are the requirements
248-
you'll need to meet.
249-
url: /spec/v1.0/
250-
children:
251-
252-
- title: Understanding SLSA
253-
description: >
254-
These pages provide an overview of SLSA, how it helps protect against common
255-
supply chain attacks, and common use cases. If you're new to SLSA or
256-
supply chain security, start here.
257-
children:
258-
259-
- title: What's new in v1.0
260-
url: /spec/v1.0/whats-new
261-
description: What's new in SLSA Version 1.0
262-
263-
- title: About SLSA
264-
url: /spec/v1.0/about
265-
description: An introductory guide to SLSA
266-
267-
- title: Supply chain threats
268-
url: /spec/v1.0/threats-overview
269-
description: An introduction to supply chain threats
270-
271-
- title: Use cases
272-
url: /spec/v1.0/use-cases
273-
description: Use cases
274-
275-
- title: Guiding principles
276-
url: /spec/v1.0/principles
277-
description: Use cases
278-
279-
- title: FAQ
280-
url: /spec/v1.0/faq
281-
description: Questions and more information
282-
283-
- title: Future directions
284-
url: /spec/v1.0/future-directions
285-
description: Additions and changes being considered for future SLSA versions
286-
287-
- title: Core specification
288-
description: >
289-
These pages describe SLSA's security levels and requirements for each track.
290-
If you want to achieve SLSA a particular level, these are the requirements
291-
you'll need to meet.
292-
children:
293-
294-
- title: Terminology
295-
url: /spec/v1.0/terminology
296-
description: Terminology and model used by SLSA
297-
298-
- title: Security levels
299-
url: /spec/v1.0/levels
300-
description: Overview of SLSA's tracks and levels, intended for all audiences
301-
302-
- title: Producing artifacts
303-
url: /spec/v1.0/requirements
304-
description: Detailed technical requirements for producing software artifacts, intended for platform implementers
305-
306-
- title: Distributing provenance
307-
url: /spec/v1.0/distributing-provenance
308-
description: Detailed technical requirements for distributing provenance, intended for platform implementers and software distributors
309-
310-
- title: Verifying artifacts
311-
url: /spec/v1.0/verifying-artifacts
312-
description: Guidance for verifying software artifacts and their SLSA provenance, intended for platform implementers and software consumers
313-
314-
- title: Verifying build platforms
315-
url: /spec/v1.0/verifying-systems
316-
description: Guidelines for securing SLSA Build L3+ builders, intended for platform implementers
317-
318-
- title: Threats & mitigations
319-
url: /spec/v1.0/threats
320-
description: Detailed information about specific supply chain attacks and how SLSA helps
321-
322-
- title: Attestation formats
323-
description: >
324-
These pages include the concrete schemas for SLSA attestations. The
325-
Provenance and VSA formats are recommended, but not required by the
326-
specification.
327-
children:
328-
329-
- title: General model
330-
url: /spec/v1.0/attestation-model
331-
description: General attestation mode
332-
333-
- title: Provenance
334-
url: /spec/v1.0/provenance
335-
description: Suggested provenance format and explanation
336-
337-
- title: Verification Summary
338-
url: /spec/v1.0/verification_summary
339-
description: Suggested VSA format and explanation
340-
341-
- title: Single-page view
342-
url: /spec/v1.0/onepage
343-
skip_next_prev: true # don't show as a next/prev link
344-
345244
- title: SLSA Working Draft
346245
url: /spec/draft/
347246
children:

0 commit comments

Comments
 (0)