Skip to content

Commit b7832a3

Browse files
authored
Version 2.16.0
2 parents 50079a2 + d6a1ed2 commit b7832a3

File tree

77 files changed

+3510
-398
lines changed

Some content is hidden

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

77 files changed

+3510
-398
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Software Name: floss-toolbox
2+
# SPDX-FileCopyrightText: Copyright (c) Orange SA
3+
# SPDX-License-Identifier: Apache-2.0
4+
#
5+
# This software is distributed under the Apache 2.0 license,
6+
# the text of which is available at https://opensource.org/license/apache-2-0
7+
# or see the "LICENSE.txt" file for more details.
8+
#
9+
# Authors: See CONTRIBUTORS.txt
10+
# Software description: A toolbox of scripts to help work of forges admins and open source referents
11+
12+
name: gitleaks
13+
on: [pull_request, push, workflow_dispatch]
14+
jobs:
15+
scan:
16+
name: gitleaks
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v4
20+
with:
21+
fetch-depth: 0
22+
- uses: gitleaks/gitleaks-action@v2
23+
env:
24+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
25+
GITLEAKS_LICENSE: ${{ secrets.GITLEAKS_LICENSE }}

CHANGELOG.md

Lines changed: 57 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,102 +5,121 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## Unreleased
8+
## [Unreleased](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.16.0..dev)
99

10-
## [2.15.0] - 2024-03-12
10+
## [2.16.0](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.16.0..2.15.0) - 2024-03-16
1111

1212
### Added
1313

14-
- Project - Generate THIRD-PARTY.md based on user inputs ([#119](https://github.com/Orange-OpenSource/floss-toolbox/issues/119))
14+
- [Utils] Add metrics and improve outputs for third-party generator scripts
1515

16-
## [2.14.0] - 2024-03-01
16+
### Changed
17+
18+
- [Licenses Inventory] Update dependency pytests to v7.4.4
19+
- [Licenses Inventory] Update dependency beautifulsoup4 to v4.12.3
20+
- [Licenses Inventory] Improve requirements for Python modules in use ([#108](https://github.com/Orange-OpenSource/floss-toolbox/issues/108))
21+
- [Project] Plug Renovate, Gitleaks ([#112](https://github.com/Orange-OpenSource/floss-toolbox/issues/112))
22+
- [Project] Apply REUSE standards ([#114](https://github.com/Orange-OpenSource/floss-toolbox/issues/114))
23+
- [Project] Improve a bit CHANGELOG by leading scope keyword for each line
24+
25+
### Security
26+
27+
- [Licenses Inventory] Bump requests from v2.28.1 to v2.31.0 ([#3](https://github.com/Orange-OpenSource/floss-toolbox/security/dependabot/3))
28+
29+
## [2.15.0](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.15.0..2.14.0) - 2024-03-12
30+
31+
### Added
32+
33+
- [Project] Generate THIRD-PARTY.md based on user inputs ([#119](https://github.com/Orange-OpenSource/floss-toolbox/issues/119))
34+
35+
## [2.14.0](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.14.0..2.13.0) - 2024-03-01
1736

1837
### Added
1938

20-
- Generate template-based text using variables ([#84](https://github.com/Orange-OpenSource/floss-toolbox/issues/84))
39+
- [Utils] Generate template-based text using variables ([#84](https://github.com/Orange-OpenSource/floss-toolbox/issues/84))
2140

2241
### Changed
2342

24-
- Make CHANGELOG more compliant ([#103](https://github.com/Orange-OpenSource/floss-toolbox/issues/103))
43+
- [Project] Make CHANGELOG more compliant ([#103](https://github.com/Orange-OpenSource/floss-toolbox/issues/103))
2544

26-
## [2.13.0] - 2023-07-19
45+
## [2.13.0](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.13.0..2.12.0) - 2023-07-19
2746

2847
### Added
2948

30-
- Diver - Compute metrics with in parameter URL to clone repo ([#98](https://github.com/Orange-OpenSource/floss-toolbox/issues/98))
49+
- [Diver] Compute metrics with in parameter URL to clone repo ([#98](https://github.com/Orange-OpenSource/floss-toolbox/issues/98))
3150

3251
### Fixed
3352

34-
- Project - Broken links in README ([#96](https://github.com/Orange-OpenSource/floss-toolbox/issues/96))
53+
- [Project] Broken links in README ([#96](https://github.com/Orange-OpenSource/floss-toolbox/issues/96))
3554

36-
## [2.12.0] - 2023-07-18
55+
## [2.12.0](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.12.0..2.11.0) - 2023-07-18
3756

3857
### Added
3958

40-
- Diver - Lines of codes and useful metrics ([#28](https://github.com/Orange-OpenSource/floss-toolbox/issues/28))
59+
- [Diver] Lines of codes and useful metrics ([#28](https://github.com/Orange-OpenSource/floss-toolbox/issues/28))
4160

4261
### Changed
4362

44-
- Project - Add DCO ([#87](https://github.com/Orange-OpenSource/floss-toolbox/issues/87))
45-
- Project - Add security policy file ([#90](https://github.com/Orange-OpenSource/floss-toolbox/issues/90))
46-
- Project - Split README files ([#85](https://github.com/Orange-OpenSource/floss-toolbox/issues/85))
47-
- Licenses Inventory - Move HTML test files to archives of release ([#86](https://github.com/Orange-OpenSource/floss-toolbox/issues/86))
48-
- GitHub - Add in dry-run Gemfiles ([#93](https://github.com/Orange-OpenSource/floss-toolbox/issues/93))
63+
- [Project] Add DCO ([#87](https://github.com/Orange-OpenSource/floss-toolbox/issues/87))
64+
- [Project] Add security policy file ([#90](https://github.com/Orange-OpenSource/floss-toolbox/issues/90))
65+
- [Project] Split README files ([#85](https://github.com/Orange-OpenSource/floss-toolbox/issues/85))
66+
- [Licenses Inventory] Move HTML test files to archives of release ([#86](https://github.com/Orange-OpenSource/floss-toolbox/issues/86))
67+
- [GitHub] Add in dry-run Gemfiles ([#93](https://github.com/Orange-OpenSource/floss-toolbox/issues/93))
4968

50-
## [2.11.0] - 2023-06-28
69+
## [2.11.0](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.11.0..2.10.1) - 2023-06-28
5170

5271
### Added
5372

54-
- GitHub - Set teams permissions to read ([#82](https://github.com/Orange-OpenSource/floss-toolbox/issues/82))
73+
- [GitHub] Set teams permissions to read ([#82](https://github.com/Orange-OpenSource/floss-toolbox/issues/82))
5574

56-
## [2.10.1] - 2023-05-31
75+
## [2.10.1](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.10.1..2.10.0) - 2023-05-31
5776

5877
### Fixed
5978

60-
- Diver - Path variables not protected ([#80](https://github.com/Orange-OpenSource/floss-toolbox/issues/80))
79+
- [Diver] Path variables not protected ([#80](https://github.com/Orange-OpenSource/floss-toolbox/issues/80))
6180

62-
## [2.10.0] - 2023-05-30
81+
## [2.10.0](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.10.0..2.9.0) - 2023-05-30
6382

6483
### Added
6584

66-
- Licenses Inventory - New release ([#77](https://github.com/Orange-OpenSource/floss-toolbox/issues/77))
85+
- [Licenses Inventory] New release ([#77](https://github.com/Orange-OpenSource/floss-toolbox/issues/77))
6786

68-
## [2.9.0] - 2023-03-31
87+
## [2.9.0](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.9.0..2.8.0) - 2023-03-31
6988

7089
### Added
7190

72-
- Licenses Inventory - New release ([#64](https://github.com/Orange-OpenSource/floss-toolbox/issues/64))
91+
- [Licenses Inventory] New release ([#64](https://github.com/Orange-OpenSource/floss-toolbox/issues/64))
7392

74-
## [2.8.0] - 2023-03-10
93+
## [2.8.0](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.8.0..2.7.1) - 2023-03-10
7594

7695
### Added
7796

78-
- Project - Split dry run ([#68](https://github.com/Orange-OpenSource/floss-toolbox/issues/68))
97+
- [Project] Split dry run ([#68](https://github.com/Orange-OpenSource/floss-toolbox/issues/68))
7998

8099
### Changed
81100

82-
- Project - Update copyright ([#70](https://github.com/Orange-OpenSource/floss-toolbox/issues/70))
83-
- Project - Improve README ([#69](https://github.com/Orange-OpenSource/floss-toolbox/issues/69))
101+
- [Project] Update copyright ([#70](https://github.com/Orange-OpenSource/floss-toolbox/issues/70))
102+
- [Project] Improve README ([#69](https://github.com/Orange-OpenSource/floss-toolbox/issues/69))
84103

85-
## [2.7.1]
104+
## [2.7.1](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.7.1..2.7.0)
86105

87106
### Changed
88107

89108
- Add missing files ([#63](https://github.com/Orange-OpenSource/floss-toolbox/issues/63))
90109

91-
## [2.7.0] - 2023-01-18
110+
## [2.7.0](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.7.0..2.6.0) - 2023-01-18
92111

93112
### Added
94113

95114
- Package manager - Extract from files downloaded dependencies ([#2](https://github.com/Orange-OpenSource/floss-toolbox/issues/2))
96115

97-
## [2.6.0] - 2022-05-05
116+
## [2.6.0](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.6.0..2.5.0) - 2022-05-05
98117

99118
### Added
100119

101120
- Look for leaks and vulnerabilities with exclusion of projects ([#57](https://github.com/Orange-OpenSource/floss-toolbox/issues/57))
102121

103-
## [2.5.0] - 2022-03-09
122+
## [2.5.0](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.5.0..2.4.0) - 2022-03-09
104123

105124
### Added
106125

@@ -111,38 +130,38 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
111130

112131
- Failure of git log if no commits ([#52](https://github.com/Orange-OpenSource/floss-toolbox/issues/52))
113132

114-
## [2.4.0] - 2022-03-08
133+
## [2.4.0](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.4.0..2.3.0) - 2022-03-08
115134

116135
### Added
117136

118-
- Look for leaks (GitHub) ([#44](https://github.com/Orange-OpenSource/floss-toolbox/issues/44))
137+
- [GitHub] Look for leaks ([#44](https://github.com/Orange-OpenSource/floss-toolbox/issues/44))
119138
- Dry run ([#29](https://github.com/Orange-OpenSource/floss-toolbox/issues/29))
120139

121140
### Changed
122141

123142
- Check of vulnerabilities ([#37](https://github.com/Orange-OpenSource/floss-toolbox/issues/37))
124143
- Fix typo in doc and files ([#40](https://github.com/Orange-OpenSource/floss-toolbox/issues/40))
125144

126-
## [2.3.0] - 2022-02-25
145+
## [2.3.0](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.3.0..2.2.0) - 2022-02-25
127146

128147
### Added
129148

130149
- Find repositories with vulnerabilities (Dependabot) ([#20](https://github.com/Orange-OpenSource/floss-toolbox/issues/20))
131150

132-
## [2.2.0] 2022-02-24
151+
## [2.2.0](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.2.0..2.1.0) 2022-02-24
133152

134153
### Added
135154

136155
- Backup of repositories ([#19](https://github.com/Orange-OpenSource/floss-toolbox/issues/19))
137156
- Extract email addresses ([#27](https://github.com/Orange-OpenSource/floss-toolbox/issues/27))
138157

139-
## [2.1.0] - 2021-10-06
158+
## [2.1.0](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.1.0..2.0.0) - 2021-10-06
140159

141160
### Added
142161

143162
- List all contributors of a Git repository using Git history ([#13](https://github.com/Orange-OpenSource/floss-toolbox/issues/13))
144163

145-
## [2.0.0] - 2021-06-05
164+
## [2.0.0](https://github.com/Orange-OpenSource/floss-toolbox/compare/2.0.0..1.0.0) - 2021-06-05
146165

147166
## Added
148167

CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ keywords:
3939
- audits
4040
- history
4141
license: Apache-2.0
42-
version: v2.15.0
43-
date-released: '2024-03-12'
42+
version: v2.16.0
43+
date-released: '2024-03-19'

toolbox/LicensesInventory/licenses/LICENSE-requests.txt renamed to LICENSES/Apache-2.0.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,3 +173,30 @@
173173
defend, and hold each Contributor harmless for any liability
174174
incurred by, or claims asserted against, such Contributor by reason
175175
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
The MIT License
1+
MIT License
22

3-
Copyright (c) 2008 Scott Chacon
3+
Copyright (c) [year] [fullname]
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
99
copies of the Software, and to permit persons to whom the Software is
1010
furnished to do so, subject to the following conditions:
1111

12-
The above copyright notice and this permission notice shall be included in
13-
all copies or substantial portions of the Software.
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
1414

1515
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1616
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1717
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21-
THE SOFTWARE.
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.md

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ _Python_ is also used.
1919
And a bit of _PHP_ because it is nice to use several languages we are not used to (stop the routine!).
2020
For these needs scripting is enough.
2121

22-
# Environment
22+
## Environment
2323

2424
You should have mainly the following environments bellow, but have a look on each folder README:
2525
- _Bash_ version **3.2.5**
2626
- _Ruby_ version **2.7.1**
2727
- _Python_ version **3.7**
2828

29-
# Project tree
29+
## Project tree
3030

3131
There are 5 folders containing scripts and programs to make your life a bit easier:
3232

@@ -38,10 +38,31 @@ There are 5 folders containing scripts and programs to make your life a bit easi
3838

3939
Feel free to read each README available in all of the subdirectories listed above.
4040

41-
# Dry run
41+
## Dry run
4242

4343
To be sure you have a ready-to-run project, you can run the following dry-run command which will check if runtimes, third party tools and files are available.
4444

4545
```shell
4646
bash dry-run.sh
47-
```
47+
```
48+
49+
## About the repository
50+
51+
### Renovate
52+
53+
[Renovate](https://docs.renovatebot.com/) is used to as to try to keep updated dependencies of the project.
54+
A _renovate.json_ must be added at the project root with cofiguration details ; but **the organization admins must enable it** (through the [admin console](https://developer.mend.io/)).
55+
By default [Dependabot](https://docs.github.com/fr/code-security/supply-chain-security/understanding-your-software-supply-chain/about-supply-chain-security#what-is-dependabot) was enabled for this project but has been replaced by _Renovate_.
56+
57+
### Gitleaks
58+
59+
[Gitleaks](https://github.com/gitleaks/gitleaks) is used so as to look for secrets and leak of sensitive data.
60+
A _gitleaks.toml_ file has been placed at the project root, picked from the _Gitleaks_ repository, to define rules.
61+
A *gitleaks-action.yml* is also defined to define the GitHub Action to call and some secrets to use to do so.
62+
The *GITLEAKS_LICENSE* is defined in the organization level, **only the organization admins can make it visible to projects**.
63+
This key (dedicated to organization) has been asked to the *Gitleaks* team and received gratefully from them.
64+
65+
### DCO
66+
67+
The *Developer Certificate of Origin* is applied here thanks to a [Probot bot](https://probot.github.io/apps/dco/).
68+
On pull requests all commits must be signed off. This control is processed in an action.

0 commit comments

Comments
 (0)