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

Disable saml integration #607

Merged
merged 25 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
25 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
8fc303d
Merge branch '2/main' into disable_saml_integration
amandahla Dec 3, 2024
cc291d5
remove unecessary logic for public_baseurl
Thanhphan1147 Dec 3, 2024
3055f4d
Merge branch 'disable_saml_integration' of github.com:canonical/synap…
Thanhphan1147 Dec 3, 2024
e57cd83
add CVE to triviignore as it will be fixed in later version of synapse
Thanhphan1147 Dec 3, 2024
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
2 changes: 0 additions & 2 deletions .woke.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,5 @@ rules:
# Ignore "master" - While https://github.com/canonical/redis-k8s-operator/pull/78
# is not merged
- name: master
# Ignore "grandfathered" used by SAML configuration.
- name: grandfathered
# Ignore "whitelist" used by Synapse configuration.
- name: whitelist
3 changes: 1 addition & 2 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ options:
type: string
description: |
The public-facing base URL that clients use to access this Homeserver.
Defaults to https://<server_name>/. Only used if there is integration with
SAML integrator charm.
Defaults to https://<server_name>/.
experimental_alive_check:
type: string
description: Comma separated list of period,threshold and timeout for Synapse
Expand Down
21 changes: 0 additions & 21 deletions docs/reference/integrations.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,27 +105,6 @@ Example redis integrate command:
juju integrate synapse redis-k8s
```

### saml

_Interface_: saml

_Supported charms_: [saml-integrator](https://charmhub.io/saml-integrator/)

Integrating Synapse with SAML Integrator provides SAML configuration details so
users can be authenticated in via a SAML server.

Example saml integrate command:
```
juju integrate synapse saml-integrator:saml
```

Note that `public_baseurl` configuration set the public-facing base URL that
clients use to access this Homeserver. It's used as `entity_id` if set instead of
https://server_name.

See more information in [Charm Architecture](https://charmhub.io/synapse/docs/explanation-charm-architecture).


### smtp

_Interface_: smtp
Expand Down
347 changes: 0 additions & 347 deletions lib/charms/saml_integrator/v0/saml.py

This file was deleted.

Loading
Loading