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.

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

clickjacking guide #37166

Merged
merged 4 commits into from
Dec 17, 2024
Merged

clickjacking guide #37166

merged 4 commits into from
Dec 17, 2024

Conversation

wbamberg
Copy link
Collaborator

@wbamberg wbamberg commented Dec 10, 2024

@github-actions github-actions bot added Content:Security Security docs size/m [PR only] 51-500 LoC changed labels Dec 10, 2024
Copy link
Contributor

github-actions bot commented Dec 10, 2024

Preview URLs (16 pages)
External URLs (4)

URL: /en-US/docs/Learn/HTML/Multimedia_and_embedding/Other_embedding_technologies
Title: From object to iframe — other embedding technologies


URL: /en-US/docs/Learn/Server-side/Django/web_application_security
Title: Django web application security


URL: /en-US/docs/Web/Security/Attacks/Clickjacking
Title: Clickjacking

(comment last updated: 2024-12-17 22:57:27)

@github-actions github-actions bot added the merge conflicts 🚧 [PR only] label Dec 17, 2024
Copy link
Contributor

This pull request has merge conflicts that must be resolved before it can be merged.

@github-actions github-actions bot removed the merge conflicts 🚧 [PR only] label Dec 17, 2024
@github-actions github-actions bot added Content:WebAPI Web API docs Content:Learn Learning area docs Content:HTTP HTTP docs Content:Learn:Django Learning area Django docs Content:Glossary Glossary entries Content:Learn:HTML Learning area HTML docs labels Dec 17, 2024
@wbamberg wbamberg marked this pull request as ready for review December 17, 2024 17:55
@wbamberg wbamberg requested review from a team as code owners December 17, 2024 17:55
@wbamberg wbamberg requested review from sideshowbarker, hamishwillee and estelle and removed request for a team December 17, 2024 17:55
Copy link
Member

@estelle estelle left a comment

Choose a reason for hiding this comment

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

Very minor suggestions, so approving to not hold this up. Thanks for this.

files/en-us/web/security/types_of_attacks/index.md Outdated Show resolved Hide resolved
files/en-us/web/security/attacks/clickjacking/index.md Outdated Show resolved Hide resolved
files/en-us/web/security/attacks/clickjacking/index.md Outdated Show resolved Hide resolved
- [Clickjacking Defense Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Clickjacking_Defense_Cheat_Sheet.html) at [owasp.org](https://owasp.org/)

<section id="Quick_links">
{{ListSubpages("/en-US/docs/Web/Security", "1", "0", "1")}}
Copy link
Member

Choose a reason for hiding this comment

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

i haven't seen quicklinks in a while ;)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

haha yes. I think there will be a security sidebar, but not sure yet how it will be organized.

@wbamberg wbamberg merged commit be3f184 into mdn:main Dec 17, 2024
8 checks passed
yin1999 added a commit to mdn/translated-content that referenced this pull request Dec 18, 2024
yin1999 added a commit to mdn/translated-content that referenced this pull request Dec 18, 2024
* zh-cn: sync translated content

* clickjacking guide

ref: mdn/content#37166

---------

Co-authored-by: Allo <[email protected]>
allan-bonadio pushed a commit to allan-bonadio/content that referenced this pull request Dec 25, 2024
* clickjacking guide

* Delete old glossary entry

* Apply suggestions from code review

Co-authored-by: Estelle Weyl <[email protected]>

---------

Co-authored-by: Estelle Weyl <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Content:Glossary Glossary entries Content:HTTP HTTP docs Content:Learn:Django Learning area Django docs Content:Learn:HTML Learning area HTML docs Content:Learn Learning area docs Content:Security Security docs Content:WebAPI Web API docs size/m [PR only] 51-500 LoC changed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants