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.

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

ISD-2761 Add oauth lib and requirer #621

Open
wants to merge 78 commits into
base: 2/main
Choose a base branch
from
Open

ISD-2761 Add oauth lib and requirer #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
091c9fb
add mas-cli to synapse rock
Thanhphan1147 Nov 23, 2024
a77fb66
build mas-cli and its assets in synapse rock
Thanhphan1147 Nov 25, 2024
3666081
Merge branch 'main' into install_mas_cli_in_synapse_rock
Thanhphan1147 Nov 25, 2024
74419c5
await coroutine
Thanhphan1147 Nov 25, 2024
faf57b4
Merge branch 'install_mas_cli_in_synapse_rock' of github.com:canonica…
Thanhphan1147 Nov 25, 2024
bd97414
update assets location
Thanhphan1147 Nov 25, 2024
a432b3b
fix missing dir
Thanhphan1147 Nov 25, 2024
033304f
fix lint
Thanhphan1147 Nov 25, 2024
09dac1f
fix broken tests
Thanhphan1147 Nov 26, 2024
0edc5f3
fix lint
Thanhphan1147 Nov 26, 2024
ae65d33
update target track
Thanhphan1147 Nov 26, 2024
68c9c89
reformat rockcraft
Thanhphan1147 Nov 27, 2024
a803b92
update mas-cli tests
Thanhphan1147 Nov 28, 2024
b166265
Merge branch '2/main' into install_mas_cli_in_synapse_rock
Thanhphan1147 Nov 28, 2024
143c5d2
update synapse tag and update tests
Thanhphan1147 Nov 28, 2024
1019432
Merge branch 'install_mas_cli_in_synapse_rock' of github.com:canonica…
Thanhphan1147 Nov 28, 2024
4dc8a2f
fix test
Thanhphan1147 Nov 28, 2024
23383db
update rockcraft with changes relating to 24.04 base
Thanhphan1147 Nov 28, 2024
392262f
remove the SAML integration and all relevant code
Thanhphan1147 Nov 26, 2024
b5dd209
remove attribute_maps part from rock
Thanhphan1147 Nov 29, 2024
53457d9
Merge remote-tracking branch 'origin/2/main' into disable_saml_integr…
Thanhphan1147 Dec 2, 2024
04a4e68
add mas-datasource state component
Thanhphan1147 Nov 27, 2024
d378498
add MAS configuration state component
Thanhphan1147 Nov 28, 2024
dac1eb2
update charmstate + decorator logic
Thanhphan1147 Nov 28, 2024
899d8d0
fix cyclic import + fix test
Thanhphan1147 Nov 29, 2024
455b985
update function signatures, update fixtures, fix tests
Thanhphan1147 Dec 2, 2024
962fd0a
fix integration test
Thanhphan1147 Dec 2, 2024
a87960d
relate to mas-database before checking for status
Thanhphan1147 Dec 2, 2024
4c65b01
fix lint
Thanhphan1147 Dec 2, 2024
16e3c53
ensure that postgresql is deployed
Thanhphan1147 Dec 3, 2024
96ebabb
Merge remote-tracking branch 'origin/2/main' into add_mas_database_in…
Thanhphan1147 Dec 4, 2024
b46f376
don't raise on blocked
Thanhphan1147 Dec 4, 2024
e95d504
fix lint
Thanhphan1147 Dec 4, 2024
a40b874
rename file
Thanhphan1147 Dec 4, 2024
c0e8225
update ref
Thanhphan1147 Dec 4, 2024
46f08fc
update integration test
Thanhphan1147 Dec 4, 2024
b8dad26
relate to postgresql-k8s as required by MAS
Thanhphan1147 Dec 4, 2024
f4a9232
add cve to trivyignore as they'll be removed with later PRs updating …
Thanhphan1147 Dec 4, 2024
184448e
Merge branch '2/main' into add_mas_database_integration
Thanhphan1147 Dec 5, 2024
3e467db
fix lint
Thanhphan1147 Dec 5, 2024
975ea01
Merge branch 'add_mas_database_integration' of github.com:canonical/s…
Thanhphan1147 Dec 5, 2024
47ab09e
add database name param to observer, fix test
Thanhphan1147 Dec 6, 2024
fe08335
remove fixed CVEs
Thanhphan1147 Dec 6, 2024
7939574
remove typing.override as it's a python3.12 feature
Thanhphan1147 Dec 6, 2024
dcc9472
Merge branch '2/main' into add_mas_database_integration
Thanhphan1147 Dec 6, 2024
39367e9
missing app name
Thanhphan1147 Dec 6, 2024
89e7bba
Merge branch 'add_mas_database_integration' of github.com:canonical/s…
Thanhphan1147 Dec 6, 2024
2edd948
add_mas_template
Thanhphan1147 Nov 29, 2024
4a8c15c
add diagram + update code
Thanhphan1147 Dec 1, 2024
544f7b6
update method prototype
Thanhphan1147 Dec 2, 2024
298cd6f
add configuration template, add mas service to manage configuration f…
Thanhphan1147 Dec 3, 2024
ced34c3
update charmcraft
Thanhphan1147 Dec 3, 2024
a1e9065
update encryption key length and template to match MAS spec
Thanhphan1147 Dec 3, 2024
82b547f
add missing policy reference
Thanhphan1147 Dec 3, 2024
4e4ff6d
fix unintended naming changes
Thanhphan1147 Dec 6, 2024
136b994
Merge remote-tracking branch 'origin/2/main' into render_mas_config_f…
Thanhphan1147 Dec 7, 2024
4eba748
fix unit test
Thanhphan1147 Dec 9, 2024
a2f73ce
remove diagram, update naming
Thanhphan1147 Dec 9, 2024
4d1fd86
fix lint
Thanhphan1147 Dec 9, 2024
b13e8c3
update integration test
Thanhphan1147 Dec 10, 2024
ad63e70
fix lint and update test ( wait for active before relating to postgre…
Thanhphan1147 Dec 10, 2024
7dc4160
add configuration template, add mas service to manage configuration f…
Thanhphan1147 Dec 3, 2024
af08dc1
start MAS with password login flow, update nginx routing logic, updat…
Thanhphan1147 Dec 5, 2024
6151841
refactor + update tests
Thanhphan1147 Dec 11, 2024
4d5de49
update mas config, restart mas before synapse
Thanhphan1147 Dec 12, 2024
c15a461
update tests
Thanhphan1147 Dec 13, 2024
cdb4912
Merge remote-tracking branch 'origin/2/main' into add_mas_to_pebble_plan
Thanhphan1147 Dec 13, 2024
9fea606
update src-docs
Thanhphan1147 Dec 13, 2024
a434d80
update integration tests
Thanhphan1147 Dec 13, 2024
db9e9fe
addl ib
Thanhphan1147 Dec 6, 2024
74248fc
add oauth interface, add requirer implementation
Thanhphan1147 Dec 6, 2024
3c0236b
fix template and tests. Fix issues from rebase
Thanhphan1147 Dec 13, 2024
a3775e8
Merge remote-tracking branch 'origin/2/main' into add_oauth_lib_and_r…
Thanhphan1147 Jan 14, 2025
8c2f796
schedule provisioning jobs after registering users
Thanhphan1147 Jan 14, 2025
c1c3d26
Merge branch '2/main' into add_oauth_lib_and_requirer
Thanhphan1147 Jan 15, 2025
a61acc0
add quotes around all secrets generated with token_hex to prevent a v…
Thanhphan1147 Jan 16, 2025
03a471f
Merge branch 'add_oauth_lib_and_requirer' of github.com:canonical/syn…
Thanhphan1147 Jan 16, 2025
7a5f917
Merge branch '2/main' into add_oauth_lib_and_requirer
javierdelapuente Jan 16, 2025
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
13 changes: 0 additions & 13 deletions .trivyignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,14 @@
# Vulnerabilites related to: Pebble, Node.JS and gosu
CVE-2021-39293
CVE-2021-41771
CVE-2021-41772
CVE-2021-44716
CVE-2022-23772
CVE-2022-23806
CVE-2022-24675
CVE-2022-24921
CVE-2022-25883
CVE-2022-27664
CVE-2022-28131

Check notice on line 2 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-synapse-4142a4055d88c05ea60194be0476ca8cfcd98d90-_3.0_amd64.tar) 

CVE-2022-28131 not present anymore, can be safely removed.
CVE-2022-28327

Check notice on line 3 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-synapse-4142a4055d88c05ea60194be0476ca8cfcd98d90-_3.0_amd64.tar) 

CVE-2022-28327 not present anymore, can be safely removed.
CVE-2022-2879

Check notice on line 4 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-synapse-4142a4055d88c05ea60194be0476ca8cfcd98d90-_3.0_amd64.tar) 

CVE-2022-2879 not present anymore, can be safely removed.
CVE-2022-2880

Check notice on line 5 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-synapse-4142a4055d88c05ea60194be0476ca8cfcd98d90-_3.0_amd64.tar) 

CVE-2022-2880 not present anymore, can be safely removed.
CVE-2022-29804

Check notice on line 6 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-synapse-4142a4055d88c05ea60194be0476ca8cfcd98d90-_3.0_amd64.tar) 

CVE-2022-29804 not present anymore, can be safely removed.
CVE-2022-30580

Check notice on line 7 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-synapse-4142a4055d88c05ea60194be0476ca8cfcd98d90-_3.0_amd64.tar) 

CVE-2022-30580 not present anymore, can be safely removed.
CVE-2022-30630

Check notice on line 8 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-synapse-4142a4055d88c05ea60194be0476ca8cfcd98d90-_3.0_amd64.tar) 

CVE-2022-30630 not present anymore, can be safely removed.
CVE-2022-30631

Check notice on line 9 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-synapse-4142a4055d88c05ea60194be0476ca8cfcd98d90-_3.0_amd64.tar) 

CVE-2022-30631 not present anymore, can be safely removed.
CVE-2022-30632

Check notice on line 10 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-synapse-4142a4055d88c05ea60194be0476ca8cfcd98d90-_3.0_amd64.tar) 

CVE-2022-30632 not present anymore, can be safely removed.
CVE-2022-30633

Check notice on line 11 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-synapse-4142a4055d88c05ea60194be0476ca8cfcd98d90-_3.0_amd64.tar) 

CVE-2022-30633 not present anymore, can be safely removed.
CVE-2022-30634
CVE-2022-30635
CVE-2022-32189
Expand Down Expand Up @@ -47,9 +37,6 @@
CVE-2024-34156
CVE-2024-21538
CVE-2024-24788
# This should be removed once the following PR is merged.
# https://github.com/element-hq/synapse/pull/17955
CVE-2024-52804
# Fix ongoing:
# https://github.com/element-hq/synapse/pull/17985
CVE-2024-53981
Expand Down
2 changes: 2 additions & 0 deletions charmcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ bases:
charm-libs:
- lib: traefik_k8s.ingress
version: "2"
- lib: hydra.oauth
version: "0"
parts:
charm:
build-packages:
Expand Down
Loading
Loading