Skip to content

Commit

Permalink
Merge branch 'master' into update-master-version
Browse files Browse the repository at this point in the history 
Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz
blizzz committed Apr 5, 2024
2 parents 81fc097 + 6a675a9 commit 101a13a
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 20 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# Changelog
All notable changes to this project will be documented in this file.

## 6.1.3

### Fixed

* [Fix(Login): do not advertise CHECK_PASSWORD capability (user_saml#829)](https://github.com/nextcloud/user_saml/pull/829)

## 6.1.2

### Fixed
Expand Down
46 changes: 45 additions & 1 deletion l10n/ast.js
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,54 @@
OC.L10N.register(
"user_saml",
{
"This user account is disabled, please contact your administrator." : "Esta cuenta d'usuariu ta desactivada, ponte en contautu cola alministración",
"Saved" : "Guardóse",
"Could not save" : "Nun se pudo guardar",
"Provider" : "Fornidor",
"Unknown error, please check the log file for more details." : "Hebo un error desconocíu, comprueba'l ficheru de rexistru pa consiguir más detalles.",
"Direct log in" : "Aniciu de la sesión direutu",
"SSO & SAML log in" : "Aniciu de la sesión SAML y SSO",
"This page should not be visited directly." : "Esta páxina nun s'habría visitar direutamente.",
"Provider " : "Fornidor",
"X.509 certificate of the Service Provider" : "Certificáu X.509 del fornidor de servicios",
"Private key of the Service Provider" : "Clave privada del fornidor de servicios",
"Indicates if the SP will validate all received XML." : "Indica si'l fornidor de servicios va validar tolos XML recibíos",
"Group A, Group B, …" : "Grupu A, grupu B…",
"Email address" : "Direición de corréu electrónicu",
"Encrypted" : "Cifróse",
"Entity" : "Entidá",
"Kerberos" : "Kerberos",
"Persistent" : "Persistente",
"Transient" : "Transitoriu",
"Unspecified" : "Ensin especificar",
"Windows domain qualified name" : "Nome cualificáu del dominiu de Windows",
"SSO & SAML authentication" : "Autenticación SAML y SSO",
"Authenticate using single sign-on" : "Autenticar col aniciu de la sesión únicu",
"Open documentation" : "Abrir la documentación",
"Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account will not be possible anymore, unless you enabled \"%s\" or you go directly to the URL %s." : "Asegúrate de configurar un usuariu alministrativu que pueda acceder a esta instancia per SSO. L'aniciu de la sesión cola cuenta «%s» normal yá nun va ser posible, sacante qu'activares «%s» o vaigas direutamente a la URL «%s».",
"Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account will not be possible anymore, unless you go directly to the URL %s." : "Asegúrate de configurar un usuariu alministrativu que pueda acceder a esta instancia per SSO. L'aniciu de la sesión cola cuenta «%s» normal yá nun va ser posible, sacante que vaigas direutamente a la URL «%s».",
"Use built-in SAML authentication" : "Usar l'autenticación SAML integrada",
"Use environment variable" : "Usar la variable d'entornu",
"Global settings" : "Configuración global",
"Remove identity provider" : "Quitar el fornidor d'identidaes",
"Add identity provider" : "Amestar un fornidor d'identidaes",
"General" : "Xeneral",
"Error" : "Error"
"Identity Provider Data" : "Datos del fornidor d'identidaes",
"Show optional Identity Provider settings…" : "Amosar la configuración adicional del fornidor d'identidaes…",
"Public X.509 certificate of the IdP" : "Certificáu X.509 públicu del forndior d'identidaes",
"Attribute mapping" : "Mapéu d'atributos",
"Show attribute mapping settings…" : "Amosar la configuración del mapéu d'atributos…",
"Security settings" : "Configuración de seguranza",
"For increased security we recommend enabling the following settings if supported by your environment." : "P'aumentar la seguranza, aconseyámoste activar la configuración siguiente si'l to entornu ye compatible.",
"Show security settings…" : "Amosar la configuración de seguranza…",
"User filtering" : "Peñera d'usuarios",
"Download metadata XML" : "Baxar el XML de los metadatos",
"Reset settings" : "Reafitar la configuración",
"Metadata invalid" : "Los meta datos son inválidos",
"Metadata valid" : "Los metadatos son válidos",
"Error" : "Error",
"Access denied." : "Negóse l'accesu.",
"Login options:" : "Opciones de l'aniciu de la sesión:",
"Choose an authentication provider" : "Escueyi un fornidor d'autenticación"
},
"nplurals=2; plural=(n != 1);");
46 changes: 45 additions & 1 deletion l10n/ast.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,52 @@
{ "translations": {
"This user account is disabled, please contact your administrator." : "Esta cuenta d'usuariu ta desactivada, ponte en contautu cola alministración",
"Saved" : "Guardóse",
"Could not save" : "Nun se pudo guardar",
"Provider" : "Fornidor",
"Unknown error, please check the log file for more details." : "Hebo un error desconocíu, comprueba'l ficheru de rexistru pa consiguir más detalles.",
"Direct log in" : "Aniciu de la sesión direutu",
"SSO & SAML log in" : "Aniciu de la sesión SAML y SSO",
"This page should not be visited directly." : "Esta páxina nun s'habría visitar direutamente.",
"Provider " : "Fornidor",
"X.509 certificate of the Service Provider" : "Certificáu X.509 del fornidor de servicios",
"Private key of the Service Provider" : "Clave privada del fornidor de servicios",
"Indicates if the SP will validate all received XML." : "Indica si'l fornidor de servicios va validar tolos XML recibíos",
"Group A, Group B, …" : "Grupu A, grupu B…",
"Email address" : "Direición de corréu electrónicu",
"Encrypted" : "Cifróse",
"Entity" : "Entidá",
"Kerberos" : "Kerberos",
"Persistent" : "Persistente",
"Transient" : "Transitoriu",
"Unspecified" : "Ensin especificar",
"Windows domain qualified name" : "Nome cualificáu del dominiu de Windows",
"SSO & SAML authentication" : "Autenticación SAML y SSO",
"Authenticate using single sign-on" : "Autenticar col aniciu de la sesión únicu",
"Open documentation" : "Abrir la documentación",
"Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account will not be possible anymore, unless you enabled \"%s\" or you go directly to the URL %s." : "Asegúrate de configurar un usuariu alministrativu que pueda acceder a esta instancia per SSO. L'aniciu de la sesión cola cuenta «%s» normal yá nun va ser posible, sacante qu'activares «%s» o vaigas direutamente a la URL «%s».",
"Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account will not be possible anymore, unless you go directly to the URL %s." : "Asegúrate de configurar un usuariu alministrativu que pueda acceder a esta instancia per SSO. L'aniciu de la sesión cola cuenta «%s» normal yá nun va ser posible, sacante que vaigas direutamente a la URL «%s».",
"Use built-in SAML authentication" : "Usar l'autenticación SAML integrada",
"Use environment variable" : "Usar la variable d'entornu",
"Global settings" : "Configuración global",
"Remove identity provider" : "Quitar el fornidor d'identidaes",
"Add identity provider" : "Amestar un fornidor d'identidaes",
"General" : "Xeneral",
"Error" : "Error"
"Identity Provider Data" : "Datos del fornidor d'identidaes",
"Show optional Identity Provider settings…" : "Amosar la configuración adicional del fornidor d'identidaes…",
"Public X.509 certificate of the IdP" : "Certificáu X.509 públicu del forndior d'identidaes",
"Attribute mapping" : "Mapéu d'atributos",
"Show attribute mapping settings…" : "Amosar la configuración del mapéu d'atributos…",
"Security settings" : "Configuración de seguranza",
"For increased security we recommend enabling the following settings if supported by your environment." : "P'aumentar la seguranza, aconseyámoste activar la configuración siguiente si'l to entornu ye compatible.",
"Show security settings…" : "Amosar la configuración de seguranza…",
"User filtering" : "Peñera d'usuarios",
"Download metadata XML" : "Baxar el XML de los metadatos",
"Reset settings" : "Reafitar la configuración",
"Metadata invalid" : "Los meta datos son inválidos",
"Metadata valid" : "Los metadatos son válidos",
"Error" : "Error",
"Access denied." : "Negóse l'accesu.",
"Login options:" : "Opciones de l'aniciu de la sesión:",
"Choose an authentication provider" : "Escueyi un fornidor d'autenticación"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
1 change: 1 addition & 0 deletions l10n/es.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions l10n/es.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
"Account not provisioned." : "Cuenta de usuario no aprovisionada.",
"Your account is not provisioned, access to this service is thus not possible." : "Su cuenta no esta aprovisionada, por lo tanto el acceso a este servicio no es posible.",
"Login options:" : "Opciones de login:",
"Choose an authentication provider" : "Seleccione un proveedor de autenticación",
"Group Mapping Prefix, default: SAML_" : "Prefijo de mapeo de grupo, por defecto: SAML_"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
}
22 changes: 4 additions & 18 deletions lib/UserBackend.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,16 @@
use OCP\IUserManager;
use OCP\IUserSession;
use OCP\Server;
use OCP\User\Backend\ABackend;
use OCP\User\Backend\ICountUsersBackend;
use OCP\User\Backend\IGetDisplayNameBackend;
use OCP\User\Backend\IGetHomeBackend;
use OCP\User\Events\UserChangedEvent;
use OCP\User\Events\UserFirstTimeLoggedInEvent;
use OCP\UserInterface;
use Psr\Log\LoggerInterface;

class UserBackend implements IApacheBackend, UserInterface, IUserBackend, IGetDisplayNameBackend {
class UserBackend extends ABackend implements IApacheBackend, IUserBackend, IGetDisplayNameBackend, ICountUsersBackend, IGetHomeBackend {
/** @var IConfig */
private $config;
/** @var IURLGenerator */
Expand Down Expand Up @@ -170,23 +173,6 @@ public function initializeHomeDir(string $uid): void {
$this->eventDispatcher->dispatchTyped(new UserFirstTimeLoggedInEvent($user));
}

/**
* Check if backend implements actions
* @param int $actions bitwise-or'ed actions
* @return boolean
*
* Returns the supported actions as int to be
* compared with \OC\User\Backend::CREATE_USER etc.
* @since 4.5.0
*/
public function implementsActions($actions) {
$availableActions = \OC\User\Backend::CHECK_PASSWORD;
$availableActions |= \OC\User\Backend::GET_DISPLAYNAME;
$availableActions |= \OC\User\Backend::GET_HOME;
$availableActions |= \OC\User\Backend::COUNT_USERS;
return (bool)($availableActions & $actions);
}

/**
* delete a user
* @param string $uid The username of the user to delete
Expand Down

0 comments on commit 101a13a

Please sign in to comment.