Skip to content

Commit

Permalink
Merge branch '4.13' into 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
GuySartorelli committed Jul 5, 2023
2 parents 925b7c2 + 124933b commit ee0923d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions en/02_Developer_Guides/09_Security/03_Authentication.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ SilverStripe\Core\Injector\Injector:
SilverStripe\Security\Security:
properties:
Authenticators:
myauthenticator: %$MyVendor\MyProject\Authenticator\MyAuthenticator
myauthenticator: '%$MyVendor\MyProject\Authenticator\MyAuthenticator'
```
If there is no authenticator registered, `Authenticator` will try to fall back on the default provided authenticator (`default`), which can be changed using the following config, replacing the MemberAuthenticator with your authenticator:
```yaml
Expand All @@ -84,7 +84,7 @@ SilverStripe\Core\Injector\Injector:
SilverStripe\Security\Security:
properties:
Authenticators:
default: %$MyVendor\MyProject\Authenticator\MyAuthenticator
default: '%$MyVendor\MyProject\Authenticator\MyAuthenticator'
```

By default, the `SilverStripe\Security\MemberAuthenticator\MemberAuthenticator` is seen as the default authenticator until it's explicitly set in the config.
Expand Down Expand Up @@ -136,12 +136,12 @@ SilverStripe\Core\Injector\Injector:
properties:
LDAPSettings:
- URL: https://my-ldap-location.com
CascadeInTo: %$SilverStripe\Security\MemberAuthenticator\SessionAuthenticationHandler
CascadeInTo: '%$SilverStripe\Security\MemberAuthenticator\SessionAuthenticationHandler'
SilverStripe\Security\AuthenticationHandler:
class: SilverStripe\Security\RequestAuthenticationHandler
properties:
Handlers:
ldap: %$MyProject\LDAP\Authenticator\LDAPAuthenticator
ldap: '%$MyProject\LDAP\Authenticator\LDAPAuthenticator'
```

CascadeInTo is used to defer login or logout actions to other authenticators, after the first one has been logged in. In the example of LDAP authenticator, this is useful to check e.g. the validity of the Session (is the user still logged in?) and if not, or it's LDAP login period has expired, only then validate against the external service again, limiting the amount of requests to the external service.
Expand Down
2 changes: 1 addition & 1 deletion en/02_Developer_Guides/09_Security/06_Rate_Limiting.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Or if you want to apply your middleware to a specific route:
SilverStripe\Control\Director:
rules:
special/section:
Controller: %$MyRateLimitedController
Controller: '%$MyRateLimitedController'
```
## Applying rate limiting across an entire application
Expand Down
2 changes: 1 addition & 1 deletion en/06_Project_Governance/06_Supported_Modules.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: Modules which are commercially supported by Silverstripe
# Commercially supported modules

Silverstripe CMS ships modules that receive commercial support. Commercially supported modules receive regular updates to work with the latest Silverstripe CMS release. Their APIs conform to [semantic versioning](https://semver.org/). They are covered by:
- our [security release process](managing_security_issues) and
- our [security release process](/contributing/managing_security_issues) and
- our [major release policy](major_release_policy).

These modules will be supported for the lifetime of Silverstripe CMS 5 in the provided major versions.
Expand Down

0 comments on commit ee0923d

Please sign in to comment.