Skip to content

Commit

Permalink
Merge branch 'master' into AM17072020
Browse files Browse the repository at this point in the history
  • Loading branch information
sushi2k authored Nov 13, 2020
2 parents 7ea0b00 + 23ca732 commit 465a249
Show file tree
Hide file tree
Showing 79 changed files with 1,262 additions and 1,217 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/checkLint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ jobs:
- name: markdownlint-cli
uses: nosborn/github-action-markdown-cli@9fc95163471d6460c35cccad13645912aaa25d5f
with:
files: Document Document-de Document-es Document-fa Document-fr Document-hi Document-ja Document-ko Document-ptbr Document-ru Document-zhtw Document-zhcn
files: Document Document-de Document-es Document-fa Document-fr Document-hi Document-ja Document-ko Document-ptbr Document-ptpt Document-ru Document-zhtw Document-zhcn
config_file: ".markdownlint.json"
ignore_files: "Tools, node_modules"
23 changes: 23 additions & 0 deletions .github/workflows/docgenerator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,29 @@ jobs:
name: OWASP_MASVS-SNAPSHOT-ptbr.mobi
path: OWASP_MASVS-SNAPSHOT-ptbr.mobi

- name: Generate Portugal Portuguese PDF
run: docker run --rm -u `id -u`:`id -g` -v ${PWD}:/pandoc owasp/masvs-docgenerator:0.2 '/pandoc_makedocs.sh Document-ptpt SNAPSHOT'
- name: Upload ptpt PDF
uses: actions/upload-artifact@v1
with:
name: OWASP_MASVS-SNAPSHOT-ptpt.pdf
path: OWASP_MASVS-SNAPSHOT-ptpt.pdf
- name: Upload Portugal Portuguese EPUB
uses: actions/upload-artifact@v1
with:
name: OWASP_MASVS-SNAPSHOT-ptpt.epub
path: OWASP_MASVS-SNAPSHOT-ptpt.epub
- name: Upload Portugal Portuguese DOCX
uses: actions/upload-artifact@v1
with:
name: OWASP_MASVS-SNAPSHOT-ptpt_WIP_.docx
path: OWASP_MASVS-SNAPSHOT-ptpt_WIP_.docx
- name: Upload Portugal Portuguese MOBI
uses: actions/upload-artifact@v1
with:
name: OWASP_MASVS-SNAPSHOT-ptpt.mobi
path: OWASP_MASVS-SNAPSHOT-ptpt.mobi

- name: Generate English PDF
run: docker run --rm -u `id -u`:`id -g` -v ${PWD}:/pandoc owasp/masvs-docgenerator:0.2 '/pandoc_makedocs.sh Document SNAPSHOT'
- name: Upload English PDF
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ jobs:
run: docker run -v ${PWD}:/documents owasp/masvs-docgenerator:0.2 'cd /documents/tools && python3 export.py --format xml --lang en > OWASP_MASVS-${{ steps.get_version.outputs.VERSION }}.xml'
- name: Generate Brazilian Portuguese PDF
run: docker run --rm -u `id -u`:`id -g` -v ${PWD}:/pandoc owasp/masvs-docgenerator:0.2 '/pandoc_makedocs.sh Document-ptbr ${{ steps.get_version.outputs.VERSION }}'
- name: Generate Portugal Portuguese PDF
run: docker run --rm -u `id -u`:`id -g` -v ${PWD}:/pandoc owasp/masvs-docgenerator:0.2 '/pandoc_makedocs.sh Document-ptpt ${{ steps.get_version.outputs.VERSION }}'
- name: Generate English docs
run: docker run --rm -u `id -u`:`id -g` -v ${PWD}:/pandoc owasp/masvs-docgenerator:0.2 '/pandoc_makedocs.sh Document ${{ steps.get_version.outputs.VERSION }}'
- name: Generate French docs
Expand Down Expand Up @@ -94,6 +96,10 @@ jobs:
OWASP_MASVS-${{ steps.get_version.outputs.VERSION }}-ptbr.mobi
OWASP_MASVS-${{ steps.get_version.outputs.VERSION }}-ptbr.pdf
OWASP_MASVS-${{ steps.get_version.outputs.VERSION }}-ptbr_WIP_.docx
OWASP_MASVS-${{ steps.get_version.outputs.VERSION }}-ptpt.epub
OWASP_MASVS-${{ steps.get_version.outputs.VERSION }}-ptpt.mobi
OWASP_MASVS-${{ steps.get_version.outputs.VERSION }}-ptpt.pdf
OWASP_MASVS-${{ steps.get_version.outputs.VERSION }}-ptpt_WIP_.docx
OWASP_MASVS-${{ steps.get_version.outputs.VERSION }}-ru.epub
OWASP_MASVS-${{ steps.get_version.outputs.VERSION }}-ru.mobi
OWASP_MASVS-${{ steps.get_version.outputs.VERSION }}-ru.pdf
Expand All @@ -111,4 +117,4 @@ jobs:
OWASP_MASVS-${{ steps.get_version.outputs.VERSION }}.xml
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}


2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at jeroen.willemsen@owasp.org, sven.schleier@owasp.org, and carlos.holguera@owasp.org.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at sven.schleier@owasp.org and carlos.holguera@owasp.org.

All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Expand Down
2 changes: 1 addition & 1 deletion Document-de/0x02-Frontispiece.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Der MASVS vereint Community Engagement und Feedback aus der Praxis. Wir gehen da
[https://owasp.slack.com/messages/](https://owasp.slack.com/messages/project-mobile_omtg/details/).

Nutzerkonten können unter folgender URL angelegt werden:
[https://owasp.slack.com/join](https://owasp-slack.herokuapp.com/).
[https://owasp.slack.com/join](https://owasp.slack.com/join/shared_invite/zt-g398htpy-AZ40HOM1WUOZguJKbblqkw#/).

## Copyright and License

Expand Down
2 changes: 1 addition & 1 deletion Document-de/0x11-V6-Interaction_with_the_environment.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Die Anforderungen aus dieser Kategorie sollen sicherstellen, dass Plattform-Komp
| **6.8** | MSTG-PLATFORM-8 | Objektserialisierung wird, falls vorhanden, über eine sichere Serialisierungs-API implementiert. |||
| **6.9** | MSTG-PLATFORM-9 | Die App verwendet Mechanismen um sich vor Screen Overlay Angriffen zu schützen (nur Android). | ||
| **6.10** | MSTG-PLATFORM-10 | Cache, Speicher und geladene Ressourcen (JavaScript usw.) eines WebViews sollten gelöscht werden bevor der WebView geschlossen wird. | ||
| **6.11** | MSTG-PLATFORM-11 | Die App sollte verhindern das 3rd Party Tastaturen verwendet werden, wenn sensible Daten eingegeben werden. | ||
| **6.11** | MSTG-PLATFORM-11 | Die App sollte verhindern das 3rd Party Tastaturen verwendet werden, wenn sensible Daten eingegeben werden (nur iOS). | ||

## Referenzen

Expand Down
2 changes: 1 addition & 1 deletion Document-es/0x02-Frontispiece.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ El MASVS es la culminación del esfuerzo de la comunidad y la retroalimentación

La mejor manera de ponerse en contacto con nosotros es a través del canal OWASP Mobile Project en Slack: <https://owasp.slack.com/messages/project-mobile_omtg/details/>

Las cuentas se pueden crear en la siguiente URL: [https://owasp-slack.herokuapp.com/](https://owasp-slack.herokuapp.com/).
Las cuentas se pueden crear en la siguiente URL: [https://owasp.slack.com/join/shared_invite/zt-g398htpy-AZ40HOM1WUOZguJKbblqkw#/](https://owasp.slack.com/join/shared_invite/zt-g398htpy-AZ40HOM1WUOZguJKbblqkw#/).

## Copyright y Licencia

Expand Down
2 changes: 1 addition & 1 deletion Document-es/0x11-V6-Interaction_with_the_environment.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Estos controles revisan que se utilicen las APIs de la plataforma y componentes
| **6.8** | MSTG-PLATFORM-8 | La serialización de objetos, si se realiza, debe implementarse utilizando API seguras. |||
| **6.9** | MSTG-PLATFORM-9 | La aplicación se protege contra ataques de tipo screen overlay. (sólo Android) | ||
| **6.10** | MSTG-PLATFORM-10 | La caché, el almacenamiento y los recursos cargados (JavaScript, etc.) de las WebViews deben de borrarse antes de destruir la WebView. | ||
| **6.11** | MSTG-PLATFORM-11 | Verificar que la aplicación impide el uso de teclados de terceros siempre que se introduzca información sensible. | ||
| **6.11** | MSTG-PLATFORM-11 | Verificar que la aplicación impide el uso de teclados de terceros siempre que se introduzca información sensible. (sólo iOS) | ||

## Referencias

Expand Down
Loading

0 comments on commit 465a249

Please sign in to comment.