diff --git a/_data/members.yml b/_data/members.yml index 2a2947b..3fde704 100644 --- a/_data/members.yml +++ b/_data/members.yml @@ -1,45 +1,51 @@ +- name: Roshni Dave + photo: roshni.jpeg + role: director, misc + github: roshda + linkedin: roshnidave + +- name: Teong Seng Tan + photo: ts.jpeg + role: director, pwn + github: asdiml + linkedin: ts-tan + - name: Andrew Kuai photo: arcblroth.png - role: director, web, misc + role: web, misc github: Arc-blroth linkedin: arcblroth -- name: Mark Epstein - photo: mark.jpg - role: director, rev, pwn - github: epsteinmark - linkedin: markepstein134 - - name: Ronak Badhe photo: r2dev2.webp - role: director, web, misc + role: web, misc github: r2dev2 website: https://r2dev2.github.io -- name: Benson Liu - photo: bliutech.png - role: advisor, web, misc - website: https://bliu.tech - github: bliutech - linkedin: bliutech - - name: Jason An photo: jason.png role: rev website: https://aplet.me github: Aplet123 -- name: Alec Machlis - photo: alec.jpg - role: web, misc - github: burturt - linkedin: alec-m - - name: Arnav Vora photo: arnav.jpg role: crypto github: AVDestroyer linkedin: arnav-vora + +- name: Cathleen Qiao + photo: cathy.jpeg + role: pwn, web, misc + github: zink-ed + linkedin: cathleenqiao + + +- name: Alec Machlis + photo: alec.jpg + role: web, misc + github: burturt + linkedin: alec-m - name: Vera Peker photo: vera.jpeg @@ -47,18 +53,6 @@ github: verapeker linkedin: verapeker -- name: Gary Song - photo: gary.png - role: crypto - github: freed2003 - linkedin: g-song - -- name: Alexander Zhang - photo: kaiphait.webp - role: pwn - github: bkrl - website: https://www.alexyzhang.dev - - name: Joshua Zhu photo: joshua-photo-square.jpg role: crypto @@ -66,19 +60,20 @@ linkedin: joshuazhu17 - name: Danniell Xu + photo: danniell.png role: crypto github: TheOtherRedGuy linkedin: danniell-xu - name: Rathul Anand photo: rathul.png - role: crypto + role: crypto, alumni github: rathull linkedin: rathul - name: Salma Alandary photo: salma.jpg - role: advisor, rev + role: rev, alumni github: ssalandary linkedin: ssalandary @@ -87,3 +82,35 @@ role: web github: stewartkwokca linkedin: stewartkwok + +- name: Gary Song + photo: gary.png + role: crypto, alumni + github: freed2003 + linkedin: g-song + +- name: Christopher Milan + role: pwn, alumni + github: sirhcm + linkedin: chrismilan + + +- name: Alexander Zhang + photo: kaiphait.webp + role: pwn, alumni + github: bkrl + website: https://www.alexyzhang.dev + +- name: Benson Liu + photo: bliutech.png + role: web, misc, alumni + website: https://bliu.tech + github: bliutech + linkedin: bliutech + +- name: Mark Epstein + photo: mark.jpg + role: rev, pwn, alumni + github: epsteinmark + linkedin: markepstein134 + diff --git a/assets/images/carousel/boilers.JPG b/assets/images/carousel/boilers.JPG new file mode 100644 index 0000000..ac7d20a Binary files /dev/null and b/assets/images/carousel/boilers.JPG differ diff --git a/assets/images/buckeye-ctf.jpeg b/assets/images/carousel/buckeye-ctf.jpeg similarity index 100% rename from assets/images/buckeye-ctf.jpeg rename to assets/images/carousel/buckeye-ctf.jpeg diff --git a/assets/images/carousel/ectf.jpg b/assets/images/carousel/ectf.jpg new file mode 100644 index 0000000..4c5da7c Binary files /dev/null and b/assets/images/carousel/ectf.jpg differ diff --git a/assets/images/lactf-carey.jpeg b/assets/images/carousel/lactf-carey.jpeg similarity index 100% rename from assets/images/lactf-carey.jpeg rename to assets/images/carousel/lactf-carey.jpeg diff --git a/assets/images/lactf-johnhammond.jpeg b/assets/images/carousel/lactf-johnhammond.jpeg similarity index 100% rename from assets/images/lactf-johnhammond.jpeg rename to assets/images/carousel/lactf-johnhammond.jpeg diff --git a/assets/images/lactf-nader.jpeg b/assets/images/carousel/lactf-nader.jpeg similarity index 100% rename from assets/images/lactf-nader.jpeg rename to assets/images/carousel/lactf-nader.jpeg diff --git a/assets/images/pbr-boba-social.jpg b/assets/images/carousel/pbr-boba-social.jpg similarity index 100% rename from assets/images/pbr-boba-social.jpg rename to assets/images/carousel/pbr-boba-social.jpg diff --git a/assets/images/pbr-team-photo.jpeg b/assets/images/carousel/pbr-team-photo.jpeg similarity index 100% rename from assets/images/pbr-team-photo.jpeg rename to assets/images/carousel/pbr-team-photo.jpeg diff --git a/assets/images/members/cathy.jpeg b/assets/images/members/cathy.jpeg new file mode 100644 index 0000000..4a1f506 Binary files /dev/null and b/assets/images/members/cathy.jpeg differ diff --git a/assets/images/members/danniell.png b/assets/images/members/danniell.png new file mode 100644 index 0000000..2731c0e Binary files /dev/null and b/assets/images/members/danniell.png differ diff --git a/assets/images/members/roshni.jpeg b/assets/images/members/roshni.jpeg new file mode 100644 index 0000000..de019a2 Binary files /dev/null and b/assets/images/members/roshni.jpeg differ diff --git a/assets/images/members/ts.jpeg b/assets/images/members/ts.jpeg new file mode 100644 index 0000000..bdd6554 Binary files /dev/null and b/assets/images/members/ts.jpeg differ diff --git a/assets/styles/carousel.scss b/assets/styles/carousel.scss index 732ddc3..799efbb 100644 --- a/assets/styles/carousel.scss +++ b/assets/styles/carousel.scss @@ -2,14 +2,18 @@ position: relative; margin: 0 auto; max-width: 2000px; - margin-bottom: 530px; + padding: 0 7%; + aspect-ratio: 16 / 9; + margin-bottom: 2rem; } .mySlides { display: none; - margin: 0 10% !important; - height: 500px; + width: 100%; + height: 100%; transition: opacity 0.5s ease-in-out; position: absolute; top: 0; + left: 0; + object-fit: cover; } \ No newline at end of file diff --git a/index.md b/index.md index 1b82d56..7d5a2f5 100644 --- a/index.md +++ b/index.md @@ -6,26 +6,24 @@ layout: default
- - - - - - + {% assign carousel_images = site.static_files | where_exp: "f", "f.path contains '/assets/images/carousel/'" | sort: "path" %} + {% for img in carousel_images %} + carousel image + {% endfor %}
## Welcome to PBR! -Welcome to the home of **Psi Beta Rho** (a.k.a. **PBR** or **ψβρ**), UCLA's competitive cybersecurity team! We are a group of hackers, programmers, and security enthusiasts who love to learn and compete. We are a part of [ACM Cyber at UCLA](https://acmcyber.com/) and are advised by [Dr. Yuan Tian](https://www.ytian.info/)! Whether we are pwning a binary or attacking a site using cross-site scripting, we like to have fun! If you want to see who is on our team, check out our [team page](/team). To see some of our writeups, check out our [blog](/blog). If you are interested in seeing what we usually talk about, check out our [past practices](/past)! If you want to see what CTFs we have attended in the past, check out our [CTFs page](/ctfs). +Welcome to the home of **Psi Beta Rho** (a.k.a. **PBR** or **ψβρ**), UCLA's competitive cybersecurity team! We are a group of hackers, programmers, and security enthusiasts who love to learn and compete. We are a part of [ACM Cyber at UCLA](https://acmcyber.com/) and are advised by [Dr. Yuan Tian](https://www.ytian.info/). Whether we are pwning a binary or attacking a site using cross-site scripting, we like to have fun. ## What do we do? -We compete in **CTFs** or [Capture the Flag](https://ctftime.org/ctf-wtf/) events, where we solve cybersecurity challenges to earn points! Currently, we meet weekly for our practices where we learn about a new topic and solve challenges related to web exploitation, cryptography, binary exploitation, and reverse engineering in addition to regularly competing in CTFs every other weekend. We also regularly invite notable speakers from top CTF teams or industry to hear about their experiences and learn about how to improve our skills to work in research and industry! Additinonally, we work on projects and research related to security including hosting our own CTF annually, [LA CTF](https://lactf.uclaacm.com/)! +We compete in **CTFs** or [Capture the Flag](https://ctftime.org/ctf-wtf/) cybersecurity events every other weekend. We also invite notable speakers from top CTF teams or industry to hear about their experiences and learn about how to improve our skills. Additinonally, we work on projects and research related to security including hosting our own CTF annually, [LA CTF](https://lactf.uclaacm.com/)! ## Join Us -Interested in joining PBR or just want to check us out? We have weekly practices this quarter in **Boelter 4760** on **Mondays** from **6:00 PM to 8:00 PM**. These are always open to the public so be sure to swing by! The best way to stay up to date with notifications for our team is to join the [ACM Cyber Discord](https://discord.gg/j9dgf2q) where we send out notifications for practices, upcoming CTFs, and like to hang out and talk about CTFs and cybersecurity. Whether you are an **experienced** CTF player or a complete **beginner**, we would love to have you on our team! We are always looking for new members so if you are a UCLA student interested in joining us, please contact us & [sign up](https://www.acmcyber.com/join)! **No experience necessary!** +Interested in joining PBR or just want to check us out? PBR is open to join, so take a look at the [ACM Cyber Discord](https://discord.gg/j9dgf2q) where we send out notifications for upcoming CTFs and more. Whether you are an **experienced** CTF player or a complete **beginner**, we would love to CTF with you. ## Contact Us -To contact us, either email us at [psibetarho@gmail.com](mailto:psibetarho@gmail.com) or join the [ACM Cyber Discord](https://discord.gg/j9dgf2q). Be sure to follow us on some of our socials such as [Twitter](https://twitter.com/psibetarho) and [Instagram](https://www.instagram.com/uclacyber/)! If you would like to see what we are up to, be sure to check out our profile on [CTF Time](https://ctftime.org/team/186494) or our [GitHub](https://github.com/pbrucla/)! If you want to see some other things our club is up to, be sure to check out the [ACM Cyber website](https://acmcyber.com/)! +To contact us, either email us at [psibetarho@gmail.com](mailto:psibetarho@gmail.com) or join the [ACM Cyber Discord](https://discord.gg/j9dgf2q). Be sure to follow us on some of our socials such as [Twitter](https://twitter.com/psibetarho) and [Instagram](https://www.instagram.com/uclacyber/)! If you would like to see what we are up to, be sure to check out our profile on [CTF Time](https://ctftime.org/team/186494) or our [GitHub](https://github.com/pbrucla/)! If you want to see some other things our club is up to, check out the [ACM Cyber website](https://acmcyber.com/)! diff --git a/past.md b/past.md index 3d5f483..81b2d3c 100644 --- a/past.md +++ b/past.md @@ -3,9 +3,19 @@ layout: default description: Some practices we have run in the past! --- -# Past Practices +# Past Talks -Here are some practices we have run in the past! +Here's an archive of talks we've run in the past! + + +## Winter 2025 +- **Week 4:** *Mutation XSS*. Presented by Benson. [Slides](https://docs.google.com/presentation/d/1kJLcPEOGh-OJJ8QWAak04AFVK_KeTQCWraGImmcx4BQ/edit?usp=sharing) + + +## Fall 2024 +- **Week 3:** *OSINT*. Presented by Gary. [Slides](https://l.acmcyber.com/f24-w3-pbr) +- **Week 5:** *Prototype Pollution*. Presented by Ronak. [Slides](https://docs.google.com/presentation/d/1kEVEwnlyVtfi_Eo458whzV5wNwU1he7VN_NGCDQO-Rc/edit?usp=sharing) +- **Week 7:** *Cross-Cache Attacks*. Presented by Enzo. [Slides](https://l.acmcyber.com/f24-w7-pbr) ## Spring 2024 - **Week 2:** *LCGs and Minecraft Seedfinding*. Presented by Arnav. [Slides](https://docs.google.com/presentation/d/1tGAz_zIpPk4tgZ4InwrgybrHme5BIDwDmLxjhOOrEnA/edit?usp=sharing) diff --git a/team.html b/team.html index 1209a60..ee370b6 100644 --- a/team.html +++ b/team.html @@ -9,36 +9,97 @@

Meet the Team

{% for member in site.data.members %} -
- - -

{{ member.name }}

-

{{ member.role }}

- - {% if member.website %} - - - - {% endif %} - - {% if member.github %} - - - - {% endif %} - - {% if member.linkedin %} - - - - {% endif %} - - {% if member.instagram %} - - - - {% endif %} - -
+ {% unless member.role contains 'alumni' %} +
+ + +

{{ member.name }}

+ {% assign roles = member.role | split: ',' %} + {% assign clean_roles = '' %} + {% for r in roles %} + {% assign trimmed = r | strip %} + {% unless trimmed == 'alumni' %} + {% if clean_roles != '' %} + {% assign clean_roles = clean_roles | append: ', ' %} + {% endif %} + {% assign clean_roles = clean_roles | append: trimmed %} + {% endunless %} + {% endfor %} +

{{ clean_roles }}

+ + {% if member.website %} + + + + {% endif %} + + {% if member.github %} + + + + {% endif %} + + {% if member.linkedin %} + + + + {% endif %} + + {% if member.instagram %} + + + + {% endif %} +
+ {% endunless %} + {% endfor %} +
+ +

Alumni

+
+ {% for member in site.data.members %} + {% if member.role contains 'alumni' %} +
+ + +

{{ member.name }}

+ {% assign roles = member.role | split: ',' %} + {% assign clean_roles = '' %} + {% for r in roles %} + {% assign trimmed = r | strip %} + {% unless trimmed == 'alumni' %} + {% if clean_roles != '' %} + {% assign clean_roles = clean_roles | append: ', ' %} + {% endif %} + {% assign clean_roles = clean_roles | append: trimmed %} + {% endunless %} + {% endfor %} +

{{ clean_roles }}

+ + {% if member.website %} + + + + {% endif %} + + {% if member.github %} + + + + {% endif %} + + {% if member.linkedin %} + + + + {% endif %} + + {% if member.instagram %} + + + + {% endif %} +
+ {% endif %} {% endfor %}
\ No newline at end of file