Skip to content

Commit 98bcccd

Browse files
authored
Merge pull request #31 from JonDevOps/claude/bounty-sources-templates
Disclosure program, Google sources button, study group guide (#527, #495, #417, #341)
2 parents 0d64124 + 200dc4f commit 98bcccd

10 files changed

Lines changed: 213 additions & 21 deletions

File tree

‎.github/SECURITY.md‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
11
# Security Policy
22

3-
## Supported Versions
3+
w3develops.org is deployed continuously from `main`, so only the live site
4+
and the latest code are supported.
45

5-
These versions of the project are
6-
currently being supported with security updates.
6+
## Reporting a vulnerability
77

8-
| Version | Supported |
9-
| ------- | ------------------ |
10-
| 3.0.x | :white_check_mark: |
11-
| 2.0.x | :x: |
12-
| < 1.0 | :x: |
8+
Please don't open a public issue. Follow our vulnerability disclosure
9+
policy, which covers scope, safe harbor and how we credit researchers:
10+
<https://w3develops.org/contribute/security>
1311

14-
## Reporting a Vulnerability
15-
16-
> [!NOTE]
17-
>
18-
> Please report security issues responsibly.
19-
>
20-
> Our community-wide security policy is available here: <https://w3develops.org/contribute/security>
12+
Contact details are also in
13+
<https://w3develops.org/.well-known/security.txt>.

‎public/.well-known/security.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# How to report a security problem in w3Develops (RFC 9116)
2+
Contact: https://mailxto.com/zdhn3fit2a
3+
Contact: https://flowcrypt.com/me/w3develops
4+
Encryption: https://flowcrypt.com/pub/w3develops?show=pubkey
5+
Policy: https://w3develops.org/contribute/security
6+
Acknowledgments: https://w3develops.org/contribute/security/hall-of-fame
7+
Preferred-Languages: en
8+
Canonical: https://w3develops.org/.well-known/security.txt
9+
Expires: 2027-11-11T00:00:00.000Z

‎src/app/contribute/security/page.tsx‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,51 @@ export default function SecurityPage() {
1919
</header>
2020

2121
<div className="space-y-12">
22+
<section>
23+
<h2 className="text-3xl font-bold font-sans mb-4 border-b-2 border-yellow-400 pb-2">Our Program</h2>
24+
<p className="text-gray-300 mb-4">
25+
w3Develops runs a vulnerability disclosure program based on the <Link href="https://disclose.io" target="_blank" rel="noopener noreferrer" className="text-yellow-400 hover:underline">disclose.io</Link> framework,
26+
like the programs of many larger companies. We&apos;re a free, volunteer-run community, so we don&apos;t pay cash rewards yet. We thank researchers publicly instead:
27+
</p>
28+
<ul className="list-disc list-inside space-y-3 text-gray-300">
29+
<li>Every valid report earns a place in our <Link href="/contribute/security/hall-of-fame" className="text-yellow-400 hover:underline">Security Hall of Fame</Link>, with a link to your profile or site if you like.</li>
30+
<li>Serious findings get a write-up crediting you, once the issue is fixed.</li>
31+
<li>If we start paying bounties, we&apos;ll say so here first.</li>
32+
</ul>
33+
</section>
34+
35+
<section>
36+
<h2 className="text-3xl font-bold font-sans mb-4 border-b-2 border-yellow-400 pb-2">Scope</h2>
37+
<h3 className="text-2xl font-semibold mb-3">In scope</h3>
38+
<ul className="list-disc list-inside space-y-2 text-gray-300 mb-6">
39+
<li><code>w3develops.org</code> and <code>www.w3develops.org</code>, including signed-in pages</li>
40+
<li>The site&apos;s data access rules: reading or changing data you shouldn&apos;t be able to, through the site or directly against our Firebase project</li>
41+
<li>The site&apos;s server routes (<code>w3develops.org/api/...</code>) and background functions</li>
42+
<li>Our open-source code at <Link href="https://github.com/w3develops/w3Develops" target="_blank" rel="noopener noreferrer" className="text-yellow-400 hover:underline">github.com/w3develops/w3Develops</Link></li>
43+
</ul>
44+
<h3 className="text-2xl font-semibold mb-3">Out of scope</h3>
45+
<ul className="list-disc list-inside space-y-2 text-gray-300">
46+
<li>Services we use but don&apos;t run: Discord, YouTube, Google and Firebase themselves, GitHub, Zoho Mail, Cloudflare. Report those to their owners.</li>
47+
<li>Denial-of-service, spam, or anything that degrades the site for others</li>
48+
<li>Other members&apos; accounts or data: test only with accounts you own</li>
49+
</ul>
50+
</section>
51+
52+
<section>
53+
<h2 className="text-3xl font-bold font-sans mb-4 border-b-2 border-yellow-400 pb-2">Safe Harbor</h2>
54+
<p className="text-gray-300 mb-4">When you research and report in good faith under this policy, we consider your work authorized, and:</p>
55+
<ul className="list-disc list-inside space-y-3 text-gray-300">
56+
<li>We won&apos;t take legal action against you or ask anyone else to, for research that follows this policy.</li>
57+
<li>We consider it authorized under anti-hacking laws such as the Computer Fraud and Abuse Act, and won&apos;t bring a claim for getting around technical measures in the course of it.</li>
58+
<li>We waive the parts of our <Link href="/terms" className="text-yellow-400 hover:underline">Terms of Use</Link> that would otherwise forbid that research, only as far as needed for it.</li>
59+
<li>If someone else takes legal action over research you did under this policy, we&apos;ll make it known that it was authorized.</li>
60+
</ul>
61+
<p className="text-gray-400 mt-4">
62+
Good faith means: you follow the rules below, avoid privacy violations and disruption, stop and tell us as soon as you reach other
63+
people&apos;s data, and give us reasonable time to fix an issue before you share it. If you&apos;re unsure whether something is allowed, ask us first.
64+
</p>
65+
</section>
66+
2267
<section>
2368
<h2 className="text-3xl font-bold font-sans mb-4 border-b-2 border-yellow-400 pb-2">Research Guidelines</h2>
2469
<p className="text-gray-300 mb-6">Follow these guidelines when testing and reporting vulnerabilities:</p>

‎src/app/news/NewsFeed.tsx‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,17 @@ export default function NewsFeed({ newsItems, initialAnnouncements, latestPosts,
159159
Exciting new developments from the w3Develops ecosystem and beyond.
160160
</p>
161161
</div>
162-
<Button asChild variant="outline">
163-
<Link href="/news/archive">View Archive</Link>
164-
</Button>
162+
<div className="flex flex-wrap gap-2">
163+
{/* Google's "preferred sources": people who add us see more of our stories in Google's Top Stories */}
164+
<Button asChild variant="outline">
165+
<a href="https://www.google.com/preferences/source?q=w3develops.org" target="_blank" rel="noopener noreferrer">
166+
Add w3Develops on Google
167+
</a>
168+
</Button>
169+
<Button asChild variant="outline">
170+
<Link href="/news/archive">View Archive</Link>
171+
</Button>
172+
</div>
165173
</div>
166174
</div>
167175

‎src/components/groups/GroupForm.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,11 @@ export default function GroupForm({ kind, groupId }: { kind: GroupKind; groupId?
183183
<Card>
184184
<CardHeader>
185185
<CardTitle>{isEditing ? `Edit ${config.title}` : `Create a New ${config.title}`}</CardTitle>
186-
<CardDescription>Members see the meeting time in their own timezone.</CardDescription>
186+
<CardDescription>
187+
Members see the meeting time in their own timezone. New to running a group? Read the{' '}
188+
<Link href="/docs/guides/running-a-study-group" className="underline">group workflow</Link> and pick a{' '}
189+
<Link href="/docs/guides/curriculum-templates" className="underline">curriculum template</Link>.
190+
</CardDescription>
187191
</CardHeader>
188192
<CardContent>
189193
<form onSubmit={handleSubmit} className="grid gap-6">
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
---
2+
title: Curriculum templates
3+
description: Week-by-week plans for common study group topics, using free resources.
4+
---
5+
Copy a template into your group's description or a pinned Discord message, and adjust the pace to your group. Each plan assumes one or two meetings a week and a few hours of work between them.
6+
7+
## Progress table
8+
9+
Keep a table like this so everyone, including newcomers, can see where the group is:
10+
11+
| Week | Goal | Resource | Done by |
12+
| --- | --- | --- | --- |
13+
| 1 | Set up, first exercises | (link) | |
14+
| 2 | (next topic) | (link) | |
15+
16+
## Web development basics (8 weeks)
17+
18+
Resources: [freeCodeCamp Responsive Web Design](https://www.freecodecamp.org/learn), [MDN Learn web development](https://developer.mozilla.org/en-US/docs/Learn_web_development)
19+
20+
1. **Week 1:** how the web works; HTML structure and semantic tags.
21+
2. **Week 2:** CSS basics: selectors, the box model, colors and fonts.
22+
3. **Week 3:** layout with Flexbox; build a simple profile card.
23+
4. **Week 4:** CSS Grid and responsive design; make the card work on a phone.
24+
5. **Week 5:** forms and accessibility basics.
25+
6. **Week 6:** Git and GitHub; put your work online with GitHub Pages.
26+
7. **Week 7:** start a personal portfolio site.
27+
8. **Week 8:** finish and show your portfolio.
28+
29+
## JavaScript (10 weeks)
30+
31+
Resources: [freeCodeCamp JavaScript](https://www.freecodecamp.org/learn), [javascript.info](https://javascript.info), [The Odin Project](https://www.theodinproject.com)
32+
33+
1. **Week 1:** values, variables, types and operators.
34+
2. **Week 2:** conditionals and loops.
35+
3. **Week 3:** functions and scope.
36+
4. **Week 4:** arrays and array methods.
37+
5. **Week 5:** objects; build a small to-do list in the console.
38+
6. **Week 6:** the DOM and events; put the to-do list in a page.
39+
7. **Week 7:** fetch and promises; call a public API.
40+
8. **Week 8:** async/await and error handling.
41+
9. **Week 9:** modules and a first look at a framework.
42+
10. **Week 10:** a small project from [project ideas](https://w3develops.org/project-ideas).
43+
44+
## Python (8 weeks)
45+
46+
Resources: [Python's official tutorial](https://docs.python.org/3/tutorial/), [CS50's Introduction to Programming with Python](https://cs50.harvard.edu/python/)
47+
48+
1. **Week 1:** setup, variables, input and output.
49+
2. **Week 2:** conditionals and loops.
50+
3. **Week 3:** functions.
51+
4. **Week 4:** lists, dictionaries and sets.
52+
5. **Week 5:** files and exceptions.
53+
6. **Week 6:** modules, packages and virtual environments.
54+
7. **Week 7:** a library of your choice (requests, pandas or Flask).
55+
8. **Week 8:** a small command-line tool or script you'll actually use.
56+
57+
## Data structures and algorithms (8 weeks)
58+
59+
Resources: [Algorithms Daily](https://w3develops.org/algorithms-daily), [VisuAlgo](https://visualgo.net)
60+
61+
1. **Week 1:** Big-O and arrays.
62+
2. **Week 2:** hash maps and sets.
63+
3. **Week 3:** two pointers and sliding windows.
64+
4. **Week 4:** stacks, queues and linked lists.
65+
5. **Week 5:** recursion and binary search.
66+
6. **Week 6:** trees and tree traversal.
67+
7. **Week 7:** graphs: BFS and DFS.
68+
8. **Week 8:** dynamic programming basics; mock interviews in pairs.
69+
70+
## Cloud and DevOps (6 weeks)
71+
72+
Resources: [roadmap.sh DevOps](https://roadmap.sh/devops), your cloud provider's free tier
73+
74+
1. **Week 1:** the command line and Linux basics.
75+
2. **Week 2:** Git workflows and pull requests.
76+
3. **Week 3:** containers with Docker.
77+
4. **Week 4:** CI with GitHub Actions.
78+
5. **Week 5:** deploying a small app to the cloud.
79+
6. **Week 6:** monitoring, logs and infrastructure as code.
80+
81+
Have a template that worked for your group? [Write it up for the news](https://w3develops.org/news/write) or open a pull request to add it here.
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
---
2+
title: Running a study group
3+
description: A week-by-week workflow, tips, and what to do at each meeting.
4+
---
5+
A study group works best with a plan, a regular time, and a small habit everyone keeps. This is the workflow w3Develops groups have used since the first cohorts.
6+
7+
## Before the first meeting
8+
9+
1. **Pick a topic and a curriculum.** Use one of the [curriculum templates](/docs/guides/curriculum-templates), or bring your own. Free courses like freeCodeCamp, The Odin Project, MDN and CS50 work well.
10+
2. **Set a meeting time** on the group page, so members get a reminder before each meeting.
11+
3. **Make a Discord channel** for the group in the w3Develops Discord, and post the group's link there.
12+
4. **Write the first tasks** on the group page: "Introduce yourself", "Set up your editor", "Finish week 1".
13+
14+
## Every meeting
15+
16+
1. Someone starts a call (Zoom, Google Meet or a Discord voice channel) and posts the link in the group's Discord channel.
17+
2. Wait 10 to 15 minutes for people to join, then start. If the group agrees, record it for anyone who missed it.
18+
3. **Check in (10 min):** each person says what they finished, what they're stuck on, and what's next.
19+
4. **Work together (30 to 45 min):** pair on the hardest exercise, or each work on the next step and help whoever's stuck.
20+
5. **Wrap up (5 min):** agree what everyone does before next time, and add it as tasks on the group page.
21+
22+
## Every week
23+
24+
- Post a **weekly check-in** on the group page.
25+
- Update the group's **progress table** (see the [templates](/docs/guides/curriculum-templates)) so newcomers can see where you are.
26+
- Share one thing you learned on the [community feed](https://w3develops.org/feed).
27+
28+
## At the end
29+
30+
- Finish with a **small project** that uses what the group learned, then show it at a final meeting.
31+
- Add the projects to [Solo Projects](https://w3develops.org/solo-projects), or keep building as a [group project](https://w3develops.org/groupprojects).
32+
33+
## Tips
34+
35+
- **Keep it small.** 3 to 8 active people is easier to keep going than 30.
36+
- **Same time every week.** Consistency matters more than length.
37+
- **Lower the bar to show up.** "Come even if you didn't do the homework" keeps people coming back.
38+
- **Rotate the host** so no one person burns out.
39+
- **Ask for help early.** Post where you're stuck on the feed or in Discord; other groups have been there.
40+
- **It's fine to slow down.** Repeat a week rather than leave people behind.
41+
42+
## More resources
43+
44+
These wikis come from earlier w3Develops cohorts:
45+
46+
- **[Cohort Wiki](https://github.com/w3develops/cohort-wiki/wiki)**: how cohort teams start and run a project.
47+
- **[Project Management Wiki](https://github.com/w3develops/pmrok/wiki)**: what past project managers learned.
48+
- **[w3Develops University](https://github.com/w3develops-university/w3develops-university)**: the original study group schedule and curriculum tracker.

‎src/content/docs/guides/study-groups.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ A study group is a small group learning the same thing, like JavaScript or syste
1414
- **Check-ins:** post daily or weekly updates on what you did. Members of groups with a set time get a reminder before meetings.
1515
- **Tasks:** a shared to-do list. Everyone in the group can add and tick off tasks; see all of yours on [My tasks](https://w3develops.org/account/my-tasks).
1616
- **Leaving:** you can leave any time from the group page.
17+
18+
Running one? Follow the [study group workflow](/docs/guides/running-a-study-group) and pick a [curriculum template](/docs/guides/curriculum-templates).

‎src/content/docs/menu.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"group": "Using w3Develops",
1414
"pages": [
1515
"guides/study-groups",
16+
"guides/running-a-study-group",
17+
"guides/curriculum-templates",
1618
"guides/group-projects",
1719
"guides/community-feed",
1820
"guides/events",
@@ -49,4 +51,4 @@
4951
}
5052
]
5153
}
52-
]
54+
]

‎src/lib/site-pages.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ export const SITE_PAGES = {
244244
},
245245
'/contribute/security': {
246246
title: 'Security Disclosure Policy',
247-
description: 'How to test for and responsibly report security vulnerabilities in w3Develops.',
247+
description: 'The w3Develops vulnerability disclosure program: scope, safe harbor, how to report, and how we credit researchers.',
248248
section: 'About and policies',
249249
},
250250
'/contribute/security/hall-of-fame': {

0 commit comments

Comments
 (0)