Skip to content

auth: integrate Catapult CAT token verification #286

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

Open
mondain wants to merge 5 commits into
base: main
Choose a base branch
from
Open

auth: integrate Catapult CAT token verification #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
edd1ea4
auth: integrate Catapult CAT token verification
afrind Jun 3, 2026
ae2b150
Update catapult to fix/cbor-memory-leaks with all ASan/UBSan fixes
suhasHere Jun 5, 2026
462f7b3
ci: use recursive submodules for nested catapult/libcbor
suhasHere Jun 5, 2026
cd70cf3
Merge branch 'main' into feature/auth-catapult
mondain Jun 6, 2026
feac366
Merge branch 'main' into feature/auth-catapult
mondain Jun 10, 2026
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
8 changes: 4 additions & 4 deletions .github/workflows/ci-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:

- uses: actions/checkout@v4
with:
submodules: true
submodules: recursive

- name: Install system dependencies
run: |
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:

- uses: actions/checkout@v4
with:
submodules: true
submodules: recursive

- name: Install system dependencies
run: sudo deps/moxygen/standalone/install-system-deps.sh
Expand Down Expand Up @@ -242,7 +242,7 @@ jobs:

- uses: actions/checkout@v4
with:
submodules: true
submodules: recursive

- name: Install system dependencies
run: |
Expand Down Expand Up @@ -314,7 +314,7 @@ jobs:

- uses: actions/checkout@v4
with:
submodules: true
submodules: recursive

- name: Download bookworm moxygen tarball
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
submodules: true
submodules: recursive

- name: Install system dependencies
run: |
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:

- uses: actions/checkout@v4
with:
submodules: true
submodules: recursive

- name: Install system dependencies
run: sudo deps/moxygen/standalone/install-system-deps.sh
Expand Down Expand Up @@ -219,7 +219,7 @@ jobs:

- uses: actions/checkout@v4
with:
submodules: true
submodules: recursive

- name: Install system dependencies
run: |
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
url = git@github.com:openmoq/moxygen.git
branch = main
ignore = untracked
[submodule "deps/catapult"]
path = deps/catapult
url = https://github.com/Quicr/catapult.git
7 changes: 7 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ add_compile_definitions(
"FOLLY_XLOG_STRIP_PREFIXES=\"${CMAKE_SOURCE_DIR}:${CMAKE_BINARY_DIR}\""
)

# --- catapult (CAT/CWT/MOQT auth implementation) ---

set(ENABLE_LOGGING OFF CACHE BOOL "" FORCE)
set(CATAPULT_ENABLE_JSON OFF CACHE BOOL "" FORCE)
add_subdirectory(deps/catapult EXCLUDE_FROM_ALL)

# --- Cache library (forked from moxygen) ---

add_library(moqx_cache STATIC
Expand Down Expand Up @@ -165,6 +171,7 @@ target_link_libraries(moqx_core PUBLIC
Folly::folly_io_async_fdsock_async_fd_socket
moxygen::moxygen_moqclient
OpenSSL::Crypto
catapult
)

target_compile_options(moqx_core PRIVATE -Wall -Wextra -Wpedantic)
Expand Down
1 change: 1 addition & 0 deletions deps/catapult
Open in desktop
Submodule catapult added at 2bbf47
1 change: 1 addition & 0 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ COPY .docker-deps/moxygen /opt/moxygen
COPY CMakeLists.txt CMakePresets.json ./
COPY cmake/ cmake/
COPY src/ src/
COPY deps/catapult/ deps/catapult/
COPY deps/moxygen/build/fbcode_builder/CMake deps/moxygen/build/fbcode_builder/CMake

RUN cmake -S . -B _build --preset default \
Expand Down
Loading
Loading