Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding support for multiple editions #460

Merged
merged 17 commits into from
May 3, 2024
Merged

Adding support for multiple editions #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f028fcf
Generate all versions.
sydseter Apr 29, 2024
6253d45
Fix font issue in template
sydseter Apr 29, 2024
7470c66
resolve conflicts with master
sydseter May 2, 2024
c0e29fa
Improving documentation and help text.
sydseter Apr 29, 2024
c0f072e
Improving codecoverage.
sydseter Apr 29, 2024
7b97cd1
Update templates to ensure Platform & Code 7 gets the dec printed.
sydseter Apr 29, 2024
1832aa8
Drag back of card over the bleed to ensure it doesn't get cut with wh…
sydseter Apr 29, 2024
a858901
Toned down the back of the card.
sydseter Apr 29, 2024
38be14d
Adding minor detail to the back of the card.
sydseter Apr 29, 2024
325f19f
Update template. Do not use the owasp logo to be inline with the trad…
sydseter Apr 30, 2024
75d8a91
Update template. embed graphics.
sydseter Apr 30, 2024
52d3b33
Update template to be in line with the new cornucopia mobile codes.
sydseter May 2, 2024
e574915
Update tests to reflect the new mobile suite.
sydseter May 2, 2024
d71a866
Add the case for the mobile deck.
sydseter May 2, 2024
4451e48
Add the first version of the leaflet for the mobile deck.
sydseter May 3, 2024
59624ca
Add mobile leaflet to release files.
sydseter May 3, 2024
73d18a4
Add changelog entry.
sydseter Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions .github/workflows/pre-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,21 +85,13 @@
output/owasp_cornucopia_ecommerce_cards_es_1.30_static.docx
output/owasp_cornucopia_ecommerce_cards_es_1.30_static.pdf
output/owasp_cornucopia_ecommerce_cards_es_1.30_static.idml
output/owasp_cornucopia_ecommerce_cards_fr_1.20_dynamic.docx
output/owasp_cornucopia_ecommerce_cards_fr_1.20_dynamic.idml
output/owasp_cornucopia_ecommerce_cards_fr_1.20_static.docx
output/owasp_cornucopia_ecommerce_cards_fr_1.20_static.idml
output/owasp_cornucopia_ecommerce_cards_fr_1.30_dynamic.docx
output/owasp_cornucopia_ecommerce_cards_fr_1.30_dynamic.idml
output/owasp_cornucopia_ecommerce_cards_fr_1.30_dynamic.pdf
output/owasp_cornucopia_ecommerce_cards_fr_1.30_leaflet.idml
output/owasp_cornucopia_ecommerce_cards_fr_1.30_static.docx
output/owasp_cornucopia_ecommerce_cards_fr_1.30_static.idml
output/owasp_cornucopia_ecommerce_cards_fr_1.30_static.pdf
output/owasp_cornucopia_ecommerce_cards_nl_1.21_dynamic.docx
output/owasp_cornucopia_ecommerce_cards_nl_1.21_dynamic.idml
output/owasp_cornucopia_ecommerce_cards_nl_1.21_static.docx
output/owasp_cornucopia_ecommerce_cards_nl_1.21_static.idml
output/owasp_cornucopia_ecommerce_cards_nl_1.30_dynamic.docx
output/owasp_cornucopia_ecommerce_cards_nl_1.30_dynamic.idml
output/owasp_cornucopia_ecommerce_cards_nl_1.30_dynamic.pdf
Expand All @@ -114,17 +106,15 @@
output/owasp_cornucopia_ecommerce_cards_no-nb_1.30_static.docx
output/owasp_cornucopia_ecommerce_cards_no-nb_1.30_static.idml
output/owasp_cornucopia_ecommerce_cards_no-nb_1.30_static.pdf
output/owasp_cornucopia_ecommerce_cards_pt-br_1.20_dynamic.docx
output/owasp_cornucopia_ecommerce_cards_pt-br_1.20_dynamic.idml
output/owasp_cornucopia_ecommerce_cards_pt-br_1.20_static.docx
output/owasp_cornucopia_ecommerce_cards_pt-br_1.20_static.idml
output/owasp_cornucopia_ecommerce_cards_pt-br_1.30_dynamic.docx
output/owasp_cornucopia_ecommerce_cards_pt-br_1.30_dynamic.idml
output/owasp_cornucopia_ecommerce_cards_pt-br_1.30_dynamic.pdf
output/owasp_cornucopia_ecommerce_cards_pt-br_1.30_leaflet.idml
output/owasp_cornucopia_ecommerce_cards_pt-br_1.30_static.docx
output/owasp_cornucopia_ecommerce_cards_pt-br_1.30_static.idml
output/owasp_cornucopia_ecommerce_cards_pt-br_1.30_static.pdf
output/owasp_cornucopia_masvs_cards_en_1.00_static.idml
output/owasp_cornucopia_masvs_cards_en_1.00_leaflet.idml
README.md
source/*.yaml
resources/case/*
10 changes: 2 additions & 8 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@
creative-commons-attribution-3.0.txt
LICENSE
LICENSE.md
output/owasp_cornucopia_ecommerce_cards_en_1.21_static.docx
output/owasp_cornucopia_ecommerce_cards_en_1.21_static.idml
output/owasp_cornucopia_ecommerce_cards_en_1.30_leaflet.idml
output/owasp_cornucopia_ecommerce_cards_en_1.30_static.docx
output/owasp_cornucopia_ecommerce_cards_en_1.30_static.idml
Expand All @@ -90,27 +88,23 @@
output/owasp_cornucopia_ecommerce_cards_es_1.30_static.docx
output/owasp_cornucopia_ecommerce_cards_es_1.30_static.pdf
output/owasp_cornucopia_ecommerce_cards_es_1.30_static.idml
output/owasp_cornucopia_ecommerce_cards_fr_1.20_static.docx
output/owasp_cornucopia_ecommerce_cards_fr_1.20_static.idml
output/owasp_cornucopia_ecommerce_cards_fr_1.30_leaflet.idml
output/owasp_cornucopia_ecommerce_cards_fr_1.30_static.docx
output/owasp_cornucopia_ecommerce_cards_fr_1.30_static.idml
output/owasp_cornucopia_ecommerce_cards_fr_1.30_static.pdf
output/owasp_cornucopia_ecommerce_cards_nl_1.21_static.docx
output/owasp_cornucopia_ecommerce_cards_nl_1.21_static.idml
output/owasp_cornucopia_ecommerce_cards_nl_1.30_leaflet.idml
output/owasp_cornucopia_ecommerce_cards_nl_1.30_static.docx
output/owasp_cornucopia_ecommerce_cards_nl_1.30_static.idml
output/owasp_cornucopia_ecommerce_cards_no-nb_1.30_leaflet.idml
output/owasp_cornucopia_ecommerce_cards_no-nb_1.30_static.docx
output/owasp_cornucopia_ecommerce_cards_no-nb_1.30_static.idml
output/owasp_cornucopia_ecommerce_cards_no-nb_1.30_static.pdf
output/owasp_cornucopia_ecommerce_cards_pt-br_1.20_static.docx
output/owasp_cornucopia_ecommerce_cards_pt-br_1.20_static.idml
output/owasp_cornucopia_ecommerce_cards_pt-br_1.30_leaflet.idml
output/owasp_cornucopia_ecommerce_cards_pt-br_1.30_static.docx
output/owasp_cornucopia_ecommerce_cards_pt-br_1.30_static.idml
output/owasp_cornucopia_ecommerce_cards_pt-br_1.30_static.pdf
output/owasp_cornucopia_masvs_cards_en_1.00_static.idml
output/owasp_cornucopia_masvs_cards_en_1.00_leaflet.idml
README.md
source/*.yaml
resources/case/*
22 changes: 2 additions & 20 deletions .github/workflows/run-tests-generate-output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,43 +93,27 @@ jobs:
comment-message: "The generated Cornucopia cards in this pull request."
artifacts-branch: tmp-${{ github.event.pull_request.head.ref }}-artifacts
artifacts: |
output/owasp_cornucopia_ecommerce_cards_en_1.21_dynamic.docx
output/owasp_cornucopia_ecommerce_cards_en_1.21_dynamic.idml
output/owasp_cornucopia_ecommerce_cards_en_1.21_static.docx
output/owasp_cornucopia_ecommerce_cards_en_1.21_static.idml
output/owasp_cornucopia_ecommerce_cards_en_1.30_dynamic.docx
output/owasp_cornucopia_ecommerce_cards_en_1.30_dynamic.idml
output/owasp_cornucopia_ecommerce_cards_en_1.30_dynamic.pdf
output/owasp_cornucopia_ecommerce_cards_en_1.30_leaflet.idml
output/owasp_cornucopia_ecommerce_cards_en_1.30_static.docx
output/owasp_cornucopia_ecommerce_cards_en_1.30_static.idml
output/owasp_cornucopia_ecommerce_cards_en_1.30_static.pdf
output/owasp_cornucopia_ecommerce_cards_es_1.20_dynamic.docx
output/owasp_cornucopia_ecommerce_cards_es_1.20_dynamic.idml
output/owasp_cornucopia_ecommerce_cards_es_1.20_static.docx
output/owasp_cornucopia_ecommerce_cards_es_1.20_static.idml
output/owasp_cornucopia_ecommerce_cards_es_1.30_dynamic.docx
output/owasp_cornucopia_ecommerce_cards_es_1.30_dynamic.pdf
output/owasp_cornucopia_ecommerce_cards_es_1.30_dynamic.idml
output/owasp_cornucopia_ecommerce_cards_es_1.30_leaflet.idml
output/owasp_cornucopia_ecommerce_cards_es_1.30_static.docx
output/owasp_cornucopia_ecommerce_cards_es_1.30_static.pdf
output/owasp_cornucopia_ecommerce_cards_es_1.30_static.idml
output/owasp_cornucopia_ecommerce_cards_fr_1.20_dynamic.docx
output/owasp_cornucopia_ecommerce_cards_fr_1.20_dynamic.idml
output/owasp_cornucopia_ecommerce_cards_fr_1.20_static.docx
output/owasp_cornucopia_ecommerce_cards_fr_1.20_static.idml
output/owasp_cornucopia_ecommerce_cards_fr_1.30_dynamic.docx
output/owasp_cornucopia_ecommerce_cards_fr_1.30_dynamic.idml
output/owasp_cornucopia_ecommerce_cards_fr_1.30_dynamic.pdf
output/owasp_cornucopia_ecommerce_cards_fr_1.30_leaflet.idml
output/owasp_cornucopia_ecommerce_cards_fr_1.30_static.docx
output/owasp_cornucopia_ecommerce_cards_fr_1.30_static.idml
output/owasp_cornucopia_ecommerce_cards_fr_1.30_static.pdf
output/owasp_cornucopia_ecommerce_cards_nl_1.21_dynamic.docx
output/owasp_cornucopia_ecommerce_cards_nl_1.21_dynamic.idml
output/owasp_cornucopia_ecommerce_cards_nl_1.21_static.docx
output/owasp_cornucopia_ecommerce_cards_nl_1.21_static.idml
output/owasp_cornucopia_ecommerce_cards_nl_1.30_dynamic.docx
output/owasp_cornucopia_ecommerce_cards_nl_1.30_dynamic.idml
output/owasp_cornucopia_ecommerce_cards_nl_1.30_dynamic.pdf
Expand All @@ -144,14 +128,12 @@ jobs:
output/owasp_cornucopia_ecommerce_cards_no-nb_1.30_static.docx
output/owasp_cornucopia_ecommerce_cards_no-nb_1.30_static.idml
output/owasp_cornucopia_ecommerce_cards_no-nb_1.30_static.pdf
output/owasp_cornucopia_ecommerce_cards_pt-br_1.20_dynamic.docx
output/owasp_cornucopia_ecommerce_cards_pt-br_1.20_dynamic.idml
output/owasp_cornucopia_ecommerce_cards_pt-br_1.20_static.docx
output/owasp_cornucopia_ecommerce_cards_pt-br_1.20_static.idml
output/owasp_cornucopia_ecommerce_cards_pt-br_1.30_dynamic.docx
output/owasp_cornucopia_ecommerce_cards_pt-br_1.30_dynamic.idml
output/owasp_cornucopia_ecommerce_cards_pt-br_1.30_dynamic.pdf
output/owasp_cornucopia_ecommerce_cards_pt-br_1.30_leaflet.idml
output/owasp_cornucopia_ecommerce_cards_pt-br_1.30_static.docx
output/owasp_cornucopia_ecommerce_cards_pt-br_1.30_static.idml
output/owasp_cornucopia_ecommerce_cards_pt-br_1.30_static.pdf
output/owasp_cornucopia_masvs_cards_en_1.00_static.idml
output/owasp_cornucopia_masvs_cards_en_1.00_leaflet.idml
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,10 @@ Add meta data to the processing for editions, languages and versions.
Add logging.
Add testing.

## Changes & Updates
### 2024-04-30

- Adding editions, languages and versions to the deck converter.
- Adding the mobile edition.
- Adding functionality for building the leaflet.
- Update the ASVS mapping version to ASVS 4.0.3.
14 changes: 10 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,13 @@ options:
Input (template) file to use.
Default=resources/templates/owasp_cornucopia_edition_lang_ver_template.(docx|idml)
Template type is dependent on output type (-t) or file (-o) specified.
-v {1.20,1.21,1.30}, --version {1.20,1.21,1.30}
-v {1.00,1.20,1.21,1.30}, --version {1.00,1.20,1.21,1.30}
Output version to produce. [`1.20`, `1.21`, `1.30`]
Version 1.20 and 1.2x will deliver cards mapped to ASVS 3.0.1
Version 1.30 and 1.3x will deliver cards mapped to ASVS 4.0
Version 1.00 and 1.0x will deliver cards mapped to MASVS 2.0
Version all will deliver all versions
Version latest will deliver the latest deck versions
-t {all,docx,pdf,idml}, --outputfiletype {all,docx,pdf,idml}
Type of file to output. Default = docx. If specified, this overwrites the output file extension
-o OUTPUTFILE, --outputfile OUTPUTFILE
Expand All @@ -52,9 +55,12 @@ options:
Template will attempt to create a template from the english input file and
replacing strings with the template lookup codes
-d, --debug Output additional information to debug script
-s {all,static,dynamic}, --style {all,static,dynamic}
Output style to produce. [`static` or `dynamic`]
Static cards have the mappings printed on them, dynamic ones a QRCode that points to an maintained list.
-e {all,ecommerce,masvs}, --edition {all,ecommerce,masvs}
Output decks to produce. [`all`, `ecommerce` or `masvs`]
The various Cornucopia decks. `web` will give you the web ecommerce edition.`masvs` will give you the MASVS/MASTG edition.
-s {all,static,dynamic,leaflet}, --style {all,static,dynamic,leaflet}
Output style to produce. [`static`, `dynamic` or `leaflet`]
Static cards have the mappings printed on them, dynamic ones a QRCode that points to an maintained list.The leaflet contains the instructions
-u URL, --url URL Specify a URL to use in generating dynamic cards. (caution: URL will be suffixed with / and the card ID).
```

Expand Down
40,226 changes: 40,226 additions & 0 deletions resources/case/owasp_cornucopia_masvs_1.30_case.ai
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added resources/case/owasp_cornucopia_masvs_1.30_case.pdf
View file
Open in desktop
Binary file not shown.
Binary file added resources/case/owasp_cornucopia_masvs_1.30_case.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...ia_edition_lang_ver_template_dynamic.docx → ..._ecommerce_lang_ver_template_dynamic.docx
View file
Open in desktop
File renamed without changes.
0 ...ia_edition_lang_ver_template_dynamic.idml → ..._ecommerce_lang_ver_template_dynamic.idml
View file
Open in desktop
File renamed without changes.
0 ...ia_edition_lang_ver_template_leaflet.idml → ..._ecommerce_lang_ver_template_leaflet.idml
View file
Open in desktop
File renamed without changes.
0 ...pia_edition_lang_ver_template_static.docx → ...a_ecommerce_lang_ver_template_static.docx
View file
Open in desktop
File renamed without changes.
0 ...pia_edition_lang_ver_template_static.idml → ...a_ecommerce_lang_ver_template_static.idml
View file
Open in desktop
File renamed without changes.
Binary file removed resources/templates/owasp_cornucopia_edition_lang_ver_template_masvs.idml
View file
Open in desktop
Binary file not shown.
Binary file added resources/templates/owasp_cornucopia_masvs_lang_ver_template_dynamic.idml
View file
Open in desktop
Binary file not shown.
Binary file added resources/templates/owasp_cornucopia_masvs_lang_ver_template_leaflet.idml
View file
Open in desktop
Binary file not shown.
Binary file added resources/templates/owasp_cornucopia_masvs_lang_ver_template_static.idml
View file
Open in desktop
Binary file not shown.
Loading