From 58c870600a69ab5c5183ce4d7569bd82930bdb8e Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Mon, 22 Mar 2021 03:23:35 +0000 Subject: [PATCH 01/38] [tx-robot] updated from transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nextcloud bot Signed-off-by: Philipp Seßner --- l10n/zh_HK.js | 34 +++++++++++++++++----------------- l10n/zh_HK.json | 34 +++++++++++++++++----------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js index 54a66411f..afc0d4f1c 100644 --- a/l10n/zh_HK.js +++ b/l10n/zh_HK.js @@ -9,16 +9,16 @@ OC.L10N.register( "SSO & SAML log in" : "SSO & SAML 登入", "This page should not be visited directly." : "不應直接訪問此頁面。", "Provider " : "提供者", - "X.509 certificate of the Service Provider" : "服務提供者 (SP) 的 X.509 憑證", - "Private key of the Service Provider" : "服務提供者 (SP) 的私鑰", - "Indicates that the nameID of the sent by this SP will be encrypted." : "表明 SP 發送的 nameID 將被加密。", - "Indicates whether the messages sent by this SP will be signed. [Metadata of the SP will offer this info]" : "指示此SP發送的消息是否將被簽名。 [SP的元數據將提供此信息]", - "Indicates whether the messages sent by this SP will be signed." : "表明是否將對此SP發送的條消息進行簽名。", - "Indicates whether the messages sent by this SP will be signed." : "表明是否將對此SP發送的條消息進行簽名。", + "X.509 certificate of the Service Provider" : "服務提供者（SP）的 X。509 憑證", + "Private key of the Service Provider" : "服務提供者（SP）的私鑰", + "Indicates that the nameID of the sent by this SP will be encrypted." : "表明 SP 發送的 nameID 將被加密。", + "Indicates whether the messages sent by this SP will be signed. [Metadata of the SP will offer this info]" : "指示此SP發送的消息是否將被簽名。 [SP的元數據將提供此信息]", + "Indicates whether the messages sent by this SP will be signed." : "表明是否將對此SP發送的條消息進行簽名。", + "Indicates whether the messages sent by this SP will be signed." : "表明是否將對此SP發送的條消息進行簽名。", "Whether the metadata should be signed." : "元數據是否將被簽名。", - "Indicates a requirement for the , and elements received by this SP to be signed." : "表示此 SP 接收的 ，和 的要求。", - "Indicates a requirement for the elements received by this SP to be signed. [Metadata of the SP will offer this info]" : "表示此SP接收到的元素需要簽名。 [SP的元數據將提供此信息]", - "Indicates a requirement for the elements received by this SP to be encrypted." : "表示要對此SP接收到的元素進行加密。", + "Indicates a requirement for the , and elements received by this SP to be signed." : "表示此 SP 接收的 ，和 的要求。", + "Indicates a requirement for the elements received by this SP to be signed. [Metadata of the SP will offer this info]" : "表示此SP接收到的元素需要簽名。 [SP的元數據將提供此信息]", + "Indicates a requirement for the elements received by this SP to be encrypted." : "表示要對此SP接收到的元素進行加密。", " Indicates a requirement for the NameID element on the SAMLResponse received by this SP to be present." : "表示此 SP 收到的 SAMLResponse 上的 NameID 元素的要求。", "Indicates a requirement for the NameID received by this SP to be encrypted." : "表示對此 SP 接收到的 NameID 進行加密的要求。", "Indicates if the SP will validate all received XML." : "指定 SP 是否驗證所有接收到的 XML。", @@ -45,7 +45,7 @@ OC.L10N.register( "Allow the use of multiple user back-ends (e.g. LDAP)" : "允許使用多個用戶後端（例如 LDAP）", "SSO & SAML authentication" : "SSO & SAML 認證", "Authenticate using single sign-on" : "使用單點登入認證", - "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix." : "使用 Nextcloud 的 SSO 和 SAML 應用程式，您可以輕鬆地將現有的單點登入解決方案與 Nextcloud 集成。此外，您可以使用 Nextcloud LDAP 用戶提供程序為用戶（例如，共享時）提供便利。\n\n目前支持以下提供程序：\n\n*** SAML 2.0 **\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory聯合身分驗證服務（ADFS）\n\n* **通過環境變量驗證**\n\t* Kerberos（mod_auth_kerb）\n\t*使用環境變量進行身分驗證的任何其他提供程序\n\n從理論上講，實現上述標準之一的任何其他身分驗證提供程序都是兼容的，但我們要指出的是，它們不屬於任何內部測試矩陣。", + "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix." : "使用 Nextcloud 的 SSO 和 SAML 應用程式，您可以輕鬆地將現有的單點登入解決方案與 Nextcloud 集成。此外，您可以使用 Nextcloud LDAP 用戶提供程序為用戶（例如，共享時）提供便利。\n\n目前支持以下提供程序：\n\n*** SAML 2。0 **\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory聯合身分驗證服務（ADFS）\n\n* **通過環境變量驗證**\n\t* Kerberos（mod_auth_kerb）\n\t*使用環境變量進行身分驗證的任何其他提供程序\n\n從理論上講，實現上述標準之一的任何其他身分驗證提供程序都是兼容的，但我們要指出的是，它們不屬於任何內部測試矩陣。", "Open documentation" : "打開文檔", "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you enabled \"%s\" or you go directly to the URL %s." : "請確保設置一個能通過SSO訪問實例的管理員用戶。您將無法使用您的普通 %s 賬號登入，除非您啟用 \"%s\" 或直接訪問URL %s。", "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you go directly to the URL %s." : "請確保設置一個能通過SSO訪問實例的管理員用戶。您將無法使用您的普通 %s 賬號登入，除非您直接訪問URL %s。", @@ -56,24 +56,24 @@ OC.L10N.register( "Remove identity provider" : "移除身分提供者", "Add identity provider" : "添加身分提供者", "General" : "常規", - "Service Provider Data" : "服務提供者 (Service Provider) 資料", + "Service Provider Data" : "服務提供者（Service Provider）資料", "If your Service Provider should use certificates you can optionally specify them here." : "如果您的服務提供商使用證書，您可以在這裡選擇指定。", - "Show Service Provider settings…" : "顯示伺服器供應商設置...", + "Show Service Provider settings…" : "顯示伺服器供應商設置。。。", "Name ID format" : "名稱ID格式", - "Identity Provider Data" : "身分提供者 (IdP) 資料", + "Identity Provider Data" : "身分提供者（IdP）資料", "Configure your IdP settings here." : "在這裡配置您的 ldP 設置。", "Identifier of the IdP entity (must be a URI)" : "IdP 實體的標識符（必須是URI）", "URL Target of the IdP where the SP will send the Authentication Request Message" : "URL 的目標，其中 SP 將發送驗證請求消息", - "Show optional Identity Provider settings…" : "顯示可選的身分提供者設置...", + "Show optional Identity Provider settings…" : "顯示可選的身分提供者設置。。。", "URL Location of the IdP where the SP will send the SLO Request" : "URL 在 SP 發送 SLO 請求的 IdP 的位置", "URL Location of the IDP's SLO Response" : "IDP 的 SLO 響應的 URL 位置", - "Public X.509 certificate of the IdP" : "公共 X.509 證書的 IdP", + "Public X.509 certificate of the IdP" : "公共 X。509 證書的 IdP", "Attribute mapping" : "屬性映射", "If you want to optionally map attributes to the user you can configure these here." : "如果要選擇將屬性映射到用戶，可以在這裡配置。", - "Show attribute mapping settings…" : "顯示屬性映射設置...", + "Show attribute mapping settings…" : "顯示屬性映射設置。。。", "Security settings" : "安全設置", "For increased security we recommend enabling the following settings if supported by your environment." : "為了提升安全性，如果您的環境支持，建議啟用以下設置。", - "Show security settings…" : "顯示安全設置...", + "Show security settings…" : "顯示安全設置。。。", "Signatures and encryption offered" : "提供簽名和加密", "Signatures and encryption required" : "需要簽名和加密", "Download metadata XML" : "下載元數據 XML", diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json index 818eef885..d77fa38a6 100644 --- a/l10n/zh_HK.json +++ b/l10n/zh_HK.json @@ -7,16 +7,16 @@ "SSO & SAML log in" : "SSO & SAML 登入", "This page should not be visited directly." : "不應直接訪問此頁面。", "Provider " : "提供者", - "X.509 certificate of the Service Provider" : "服務提供者 (SP) 的 X.509 憑證", - "Private key of the Service Provider" : "服務提供者 (SP) 的私鑰", - "Indicates that the nameID of the sent by this SP will be encrypted." : "表明 SP 發送的 nameID 將被加密。", - "Indicates whether the messages sent by this SP will be signed. [Metadata of the SP will offer this info]" : "指示此SP發送的消息是否將被簽名。 [SP的元數據將提供此信息]", - "Indicates whether the messages sent by this SP will be signed." : "表明是否將對此SP發送的條消息進行簽名。", - "Indicates whether the messages sent by this SP will be signed." : "表明是否將對此SP發送的條消息進行簽名。", + "X.509 certificate of the Service Provider" : "服務提供者（SP）的 X。509 憑證", + "Private key of the Service Provider" : "服務提供者（SP）的私鑰", + "Indicates that the nameID of the sent by this SP will be encrypted." : "表明 SP 發送的 nameID 將被加密。", + "Indicates whether the messages sent by this SP will be signed. [Metadata of the SP will offer this info]" : "指示此SP發送的消息是否將被簽名。 [SP的元數據將提供此信息]", + "Indicates whether the messages sent by this SP will be signed." : "表明是否將對此SP發送的條消息進行簽名。", + "Indicates whether the messages sent by this SP will be signed." : "表明是否將對此SP發送的條消息進行簽名。", "Whether the metadata should be signed." : "元數據是否將被簽名。", - "Indicates a requirement for the , and elements received by this SP to be signed." : "表示此 SP 接收的 ，和 的要求。", - "Indicates a requirement for the elements received by this SP to be signed. [Metadata of the SP will offer this info]" : "表示此SP接收到的元素需要簽名。 [SP的元數據將提供此信息]", - "Indicates a requirement for the elements received by this SP to be encrypted." : "表示要對此SP接收到的元素進行加密。", + "Indicates a requirement for the , and elements received by this SP to be signed." : "表示此 SP 接收的 ，和 的要求。", + "Indicates a requirement for the elements received by this SP to be signed. [Metadata of the SP will offer this info]" : "表示此SP接收到的元素需要簽名。 [SP的元數據將提供此信息]", + "Indicates a requirement for the elements received by this SP to be encrypted." : "表示要對此SP接收到的元素進行加密。", " Indicates a requirement for the NameID element on the SAMLResponse received by this SP to be present." : "表示此 SP 收到的 SAMLResponse 上的 NameID 元素的要求。", "Indicates a requirement for the NameID received by this SP to be encrypted." : "表示對此 SP 接收到的 NameID 進行加密的要求。", "Indicates if the SP will validate all received XML." : "指定 SP 是否驗證所有接收到的 XML。", @@ -43,7 +43,7 @@ "Allow the use of multiple user back-ends (e.g. LDAP)" : "允許使用多個用戶後端（例如 LDAP）", "SSO & SAML authentication" : "SSO & SAML 認證", "Authenticate using single sign-on" : "使用單點登入認證", - "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix." : "使用 Nextcloud 的 SSO 和 SAML 應用程式，您可以輕鬆地將現有的單點登入解決方案與 Nextcloud 集成。此外，您可以使用 Nextcloud LDAP 用戶提供程序為用戶（例如，共享時）提供便利。\n\n目前支持以下提供程序：\n\n*** SAML 2.0 **\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory聯合身分驗證服務（ADFS）\n\n* **通過環境變量驗證**\n\t* Kerberos（mod_auth_kerb）\n\t*使用環境變量進行身分驗證的任何其他提供程序\n\n從理論上講，實現上述標準之一的任何其他身分驗證提供程序都是兼容的，但我們要指出的是，它們不屬於任何內部測試矩陣。", + "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix." : "使用 Nextcloud 的 SSO 和 SAML 應用程式，您可以輕鬆地將現有的單點登入解決方案與 Nextcloud 集成。此外，您可以使用 Nextcloud LDAP 用戶提供程序為用戶（例如，共享時）提供便利。\n\n目前支持以下提供程序：\n\n*** SAML 2。0 **\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory聯合身分驗證服務（ADFS）\n\n* **通過環境變量驗證**\n\t* Kerberos（mod_auth_kerb）\n\t*使用環境變量進行身分驗證的任何其他提供程序\n\n從理論上講，實現上述標準之一的任何其他身分驗證提供程序都是兼容的，但我們要指出的是，它們不屬於任何內部測試矩陣。", "Open documentation" : "打開文檔", "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you enabled \"%s\" or you go directly to the URL %s." : "請確保設置一個能通過SSO訪問實例的管理員用戶。您將無法使用您的普通 %s 賬號登入，除非您啟用 \"%s\" 或直接訪問URL %s。", "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you go directly to the URL %s." : "請確保設置一個能通過SSO訪問實例的管理員用戶。您將無法使用您的普通 %s 賬號登入，除非您直接訪問URL %s。", @@ -54,24 +54,24 @@ "Remove identity provider" : "移除身分提供者", "Add identity provider" : "添加身分提供者", "General" : "常規", - "Service Provider Data" : "服務提供者 (Service Provider) 資料", + "Service Provider Data" : "服務提供者（Service Provider）資料", "If your Service Provider should use certificates you can optionally specify them here." : "如果您的服務提供商使用證書，您可以在這裡選擇指定。", - "Show Service Provider settings…" : "顯示伺服器供應商設置...", + "Show Service Provider settings…" : "顯示伺服器供應商設置。。。", "Name ID format" : "名稱ID格式", - "Identity Provider Data" : "身分提供者 (IdP) 資料", + "Identity Provider Data" : "身分提供者（IdP）資料", "Configure your IdP settings here." : "在這裡配置您的 ldP 設置。", "Identifier of the IdP entity (must be a URI)" : "IdP 實體的標識符（必須是URI）", "URL Target of the IdP where the SP will send the Authentication Request Message" : "URL 的目標，其中 SP 將發送驗證請求消息", - "Show optional Identity Provider settings…" : "顯示可選的身分提供者設置...", + "Show optional Identity Provider settings…" : "顯示可選的身分提供者設置。。。", "URL Location of the IdP where the SP will send the SLO Request" : "URL 在 SP 發送 SLO 請求的 IdP 的位置", "URL Location of the IDP's SLO Response" : "IDP 的 SLO 響應的 URL 位置", - "Public X.509 certificate of the IdP" : "公共 X.509 證書的 IdP", + "Public X.509 certificate of the IdP" : "公共 X。509 證書的 IdP", "Attribute mapping" : "屬性映射", "If you want to optionally map attributes to the user you can configure these here." : "如果要選擇將屬性映射到用戶，可以在這裡配置。", - "Show attribute mapping settings…" : "顯示屬性映射設置...", + "Show attribute mapping settings…" : "顯示屬性映射設置。。。", "Security settings" : "安全設置", "For increased security we recommend enabling the following settings if supported by your environment." : "為了提升安全性，如果您的環境支持，建議啟用以下設置。", - "Show security settings…" : "顯示安全設置...", + "Show security settings…" : "顯示安全設置。。。", "Signatures and encryption offered" : "提供簽名和加密", "Signatures and encryption required" : "需要簽名和加密", "Download metadata XML" : "下載元數據 XML", From 45a1b8e91cbd2683c9db2e6894d8f0e7334bb08c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Se=C3=9Fner?= Date: Tue, 23 Mar 2021 10:15:39 +0100 Subject: [PATCH 02/38] #187 Add avatar_mapping to admin settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philipp Seßner --- lib/Settings/Admin.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index 6a7cf874d..de00f897c 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -130,6 +130,11 @@ public function getForm() { 'type' => 'line', 'required' => true, ], + 'avatar_mapping' => [ + 'text' => $this->l10n->t('Attribute to map the users avatar to.'), + 'type' => 'line', + 'required' => true, + ], ]; From 258b77c0c01a7f1053e850dcf7ca147c272f1561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Se=C3=9Fner?= Date: Tue, 23 Mar 2021 10:16:04 +0100 Subject: [PATCH 03/38] #187 Add german translations for avatar_mapping in admin settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philipp Seßner --- l10n/de.js | 3 ++- l10n/de.json | 1 + l10n/de_DE.js | 1 + l10n/de_DE.json | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/l10n/de.js b/l10n/de.js index d2da90593..6e255aba4 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -30,7 +30,8 @@ OC.L10N.register( "Attribute to map the email address to." : "Attribut dem die E-Mail-Adresse zugeordnet werden soll.", "Attribute to map the quota to." : "Attribut, dem das Kontingent zugeordnet werden soll.", "Attribute to map the users groups to." : "Attribut, dem die Gruppen des Benutzers zugeordnet werden sollen.", - "Attribute to map the users home to." : "Attribut dem das zu Hause des Benutzers zugeordnet werden soll.", + "Attribute to map the users home to." : "Attribut, dem das zu Hause des Benutzers zugeordnet werden soll.", + "Attribute to map the users avatar to." : "Attribut, dem das das Profilbild des Benutzers zugeordnet werden soll.", "Email address" : "E-Mail-Adresse", "Encrypted" : "Verschlüsselt", "Entity" : "Einheit", diff --git a/l10n/de.json b/l10n/de.json index d25c80f9e..938abf2ff 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -29,6 +29,7 @@ "Attribute to map the quota to." : "Attribut, dem das Kontingent zugeordnet werden soll.", "Attribute to map the users groups to." : "Attribut, dem die Gruppen des Benutzers zugeordnet werden sollen.", "Attribute to map the users home to." : "Attribut dem das zu Hause des Benutzers zugeordnet werden soll.", + "Attribute to map the users avatar to." : "Attribut, dem das das Profilbild des Benutzers zugeordnet werden soll.", "Email address" : "E-Mail-Adresse", "Encrypted" : "Verschlüsselt", "Entity" : "Einheit", diff --git a/l10n/de_DE.js b/l10n/de_DE.js index 10bfe75ea..1c1adcbf0 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -31,6 +31,7 @@ OC.L10N.register( "Attribute to map the quota to." : "Attribut, dem das Speicherkontingent zugeordnet werden soll.", "Attribute to map the users groups to." : "Attribut, dem die Gruppen des Benutzers zugeordnet werden sollen.", "Attribute to map the users home to." : "Attribut dem das zu Hause des Benutzers zugeordnet werden soll.", + "Attribute to map the users avatar to." : "Attribut, dem das das Profilbild des Benutzers zugeordnet werden soll.", "Email address" : "E-Mail-Adresse", "Encrypted" : "Verschlüsselt", "Entity" : "Einheit", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index 98c207547..24475df22 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -29,6 +29,7 @@ "Attribute to map the quota to." : "Attribut, dem das Speicherkontingent zugeordnet werden soll.", "Attribute to map the users groups to." : "Attribut, dem die Gruppen des Benutzers zugeordnet werden sollen.", "Attribute to map the users home to." : "Attribut dem das zu Hause des Benutzers zugeordnet werden soll.", + "Attribute to map the users avatar to." : "Attribut, dem das das Profilbild des Benutzers zugeordnet werden soll.", "Email address" : "E-Mail-Adresse", "Encrypted" : "Verschlüsselt", "Entity" : "Einheit", From 354a3add79c03a8b05578997167b8c1f55b61e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Se=C3=9Fner?= Date: Tue, 23 Mar 2021 10:17:32 +0100 Subject: [PATCH 04/38] #187 Implement getting avatar from publicly available URL with avatar_mapping config setting and disabling image upload if avatar_mapping configuration is set MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philipp Seßner --- lib/UserBackend.php | 75 +++++++++++++++++++++++++++++++++++++++++++++ lib/UserData.php | 4 +++ 2 files changed, 79 insertions(+) diff --git a/lib/UserBackend.php b/lib/UserBackend.php index 6dd1a36ee..71e45bcd9 100644 --- a/lib/UserBackend.php +++ b/lib/UserBackend.php @@ -21,6 +21,8 @@ namespace OCA\User_SAML; +use OC\User\Backend; +use OCA\User_LDAP\FilesystemHelper; use OCP\Authentication\IApacheBackend; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\Files\NotPermittedException; @@ -81,6 +83,28 @@ public function __construct( $this->userData = $userData; } + /** + * checks whether the user is allowed to change his avatar in Nextcloud + * + * @param string $uid the Nextcloud user name + * @return boolean either the user can or cannot + * @throws \Exception + */ + public function canChangeAvatar($uid) { + if (!$this->implementsActions(Backend::PROVIDE_AVATAR)) { + return true; + } + try { + if (empty(trim($this->getAttributeKeys('saml-attribute-mapping-avatar_mapping')[0]))) { + return true; + } + } catch(\InvalidArgumentException $e) { + return true; + } + + return false; + } + /** * Whether $uid exists in the database * @@ -181,6 +205,7 @@ public function implementsActions($actions) { $availableActions |= \OC\User\Backend::GET_DISPLAYNAME; $availableActions |= \OC\User\Backend::GET_HOME; $availableActions |= \OC\User\Backend::COUNT_USERS; + $availableActions |= \OC\User\Backend::PROVIDE_AVATAR; return (bool)($availableActions & $actions); } @@ -636,6 +661,14 @@ public function updateAttributes($uid, $newGroups = null; } + try { + $newAvatar = $this->getAttributeValue('saml-attribute-mapping-avatar_mapping', $attributes); + $this->logger->debug('Avatar attribute content: {avatar}', ['app' => 'user_saml', 'avatar' => $newAvatar]); + } catch (\InvalidArgumentException $e) { + $this->logger->debug('Failed to fetch avatar attribute: {exception}', ['app' => 'user_saml', 'exception' => $e->getMessage()]); + $newAvatar = null; + } + if ($user !== null) { $currentEmail = (string)$user->getEMailAddress(); if ($newEmail !== null @@ -677,9 +710,51 @@ public function updateAttributes($uid, $groupManager->get($group)->removeUser($user); } } + + if ($newAvatar !== null) { + $image = new \OCP\Image(); + $fileData = file_get_contents($newAvatar); + $image->loadFromData($fileData); + $this->setOwnCloudAvatar($uid, $image); + } } } + private function setOwnCloudAvatar($uid, $image) { + if (!$image->valid()) { + $this->logger->debug('avatar image data from LDAP invalid for ' . $uid); + return false; + } + + + //make sure it is a square and not bigger than 128x128 + $size = min([$image->width(), $image->height(), 128]); + if (!$image->centerCrop($size)) { + $this->logger->debug('croping image for avatar failed for ' . $uid); + return false; + } + + $fs = new FilesystemHelper(); + if (!$fs->isLoaded()) { + $fs->setup($uid); + } + + try { + $avatarManager = \OC::$server->getAvatarManager(); + + $avatar = $avatarManager->getAvatar($uid); + $avatar->set($image); + return true; + } catch (\Exception $e) { + $this->logger->logException($e, [ + 'message' => 'Could not set avatar for ' . $uid, + 'level' => ILogger::INFO, + 'app' => 'user_saml', + ]); + } + return false; + } + public function countUsers() { diff --git a/lib/UserData.php b/lib/UserData.php index 098a9be10..ce762013d 100644 --- a/lib/UserData.php +++ b/lib/UserData.php @@ -26,6 +26,7 @@ use OCA\User_SAML\Exceptions\NoUserFoundException; use OCP\IConfig; +use OCP\Image; class UserData { private $uid; @@ -37,11 +38,14 @@ class UserData { private $samlSettings; /** @var IConfig */ private $config; + /** @var Image */ + private $image; public function __construct(UserResolver $userResolver, SAMLSettings $samlSettings, IConfig $config) { $this->userResolver = $userResolver; $this->samlSettings = $samlSettings; $this->config = $config; + $this->image = new Image(); } public function setAttributes(array $attributes): void { From 50c7ae673f04e320cf7dcafd4e58c3cf091d53a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Se=C3=9Fner?= Date: Tue, 23 Mar 2021 10:22:42 +0100 Subject: [PATCH 05/38] #187 Adapt test for avatar_mapping in AdminTest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philipp Seßner --- tests/unit/Settings/AdminTest.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/unit/Settings/AdminTest.php b/tests/unit/Settings/AdminTest.php index 23311697d..4d4353dbc 100644 --- a/tests/unit/Settings/AdminTest.php +++ b/tests/unit/Settings/AdminTest.php @@ -139,6 +139,11 @@ public function formDataProvider() { 'type' => 'line', 'required' => true, ], + 'avatar_mapping' => [ + 'text' => $this->l10n->t('Attribute to map the users avatar to.'), + 'type' => 'line', + 'required' => true, + ], ]; $nameIdFormats = [ From 4e57d6024fbce8ff22df27bbad215b37952cebf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Se=C3=9Fner?= Date: Mon, 17 May 2021 18:59:47 +0200 Subject: [PATCH 06/38] Remove translation as they are managed in transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philipp Seßner --- l10n/de.json | 1 - 1 file changed, 1 deletion(-) diff --git a/l10n/de.json b/l10n/de.json index 938abf2ff..d25c80f9e 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -29,7 +29,6 @@ "Attribute to map the quota to." : "Attribut, dem das Kontingent zugeordnet werden soll.", "Attribute to map the users groups to." : "Attribut, dem die Gruppen des Benutzers zugeordnet werden sollen.", "Attribute to map the users home to." : "Attribut dem das zu Hause des Benutzers zugeordnet werden soll.", - "Attribute to map the users avatar to." : "Attribut, dem das das Profilbild des Benutzers zugeordnet werden soll.", "Email address" : "E-Mail-Adresse", "Encrypted" : "Verschlüsselt", "Entity" : "Einheit", From a967f77f236682c06ee118560d3d602a4a0ee0c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Se=C3=9Fner?= Date: Mon, 17 May 2021 19:06:56 +0200 Subject: [PATCH 07/38] Change indentation from 4 spaces to tabs, according to coding guidelines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philipp Seßner --- lib/Settings/Admin.php | 10 +-- lib/UserBackend.php | 134 ++++++++++++++++++++--------------------- 2 files changed, 72 insertions(+), 72 deletions(-) diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index de00f897c..6c2f9efdf 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -130,11 +130,11 @@ public function getForm() { 'type' => 'line', 'required' => true, ], - 'avatar_mapping' => [ - 'text' => $this->l10n->t('Attribute to map the users avatar to.'), - 'type' => 'line', - 'required' => true, - ], + 'avatar_mapping' => [ + 'text' => $this->l10n->t('Attribute to map the users avatar to.'), + 'type' => 'line', + 'required' => true, + ], ]; diff --git a/lib/UserBackend.php b/lib/UserBackend.php index 71e45bcd9..3dbf7a462 100644 --- a/lib/UserBackend.php +++ b/lib/UserBackend.php @@ -83,27 +83,27 @@ public function __construct( $this->userData = $userData; } - /** - * checks whether the user is allowed to change his avatar in Nextcloud - * - * @param string $uid the Nextcloud user name - * @return boolean either the user can or cannot - * @throws \Exception - */ - public function canChangeAvatar($uid) { - if (!$this->implementsActions(Backend::PROVIDE_AVATAR)) { - return true; - } - try { - if (empty(trim($this->getAttributeKeys('saml-attribute-mapping-avatar_mapping')[0]))) { - return true; - } - } catch(\InvalidArgumentException $e) { - return true; - } - - return false; - } + /** + * checks whether the user is allowed to change his avatar in Nextcloud + * + * @param string $uid the Nextcloud user name + * @return boolean either the user can or cannot + * @throws \Exception + */ + public function canChangeAvatar($uid) { + if (!$this->implementsActions(Backend::PROVIDE_AVATAR)) { + return true; + } + try { + if (empty(trim($this->getAttributeKeys('saml-attribute-mapping-avatar_mapping')[0]))) { + return true; + } + } catch(\InvalidArgumentException $e) { + return true; + } + + return false; + } /** * Whether $uid exists in the database @@ -205,7 +205,7 @@ public function implementsActions($actions) { $availableActions |= \OC\User\Backend::GET_DISPLAYNAME; $availableActions |= \OC\User\Backend::GET_HOME; $availableActions |= \OC\User\Backend::COUNT_USERS; - $availableActions |= \OC\User\Backend::PROVIDE_AVATAR; + $availableActions |= \OC\User\Backend::PROVIDE_AVATAR; return (bool)($availableActions & $actions); } @@ -662,12 +662,12 @@ public function updateAttributes($uid, } try { - $newAvatar = $this->getAttributeValue('saml-attribute-mapping-avatar_mapping', $attributes); - $this->logger->debug('Avatar attribute content: {avatar}', ['app' => 'user_saml', 'avatar' => $newAvatar]); - } catch (\InvalidArgumentException $e) { - $this->logger->debug('Failed to fetch avatar attribute: {exception}', ['app' => 'user_saml', 'exception' => $e->getMessage()]); - $newAvatar = null; - } + $newAvatar = $this->getAttributeValue('saml-attribute-mapping-avatar_mapping', $attributes); + $this->logger->debug('Avatar attribute content: {avatar}', ['app' => 'user_saml', 'avatar' => $newAvatar]); + } catch (\InvalidArgumentException $e) { + $this->logger->debug('Failed to fetch avatar attribute: {exception}', ['app' => 'user_saml', 'exception' => $e->getMessage()]); + $newAvatar = null; + } if ($user !== null) { $currentEmail = (string)$user->getEMailAddress(); @@ -712,48 +712,48 @@ public function updateAttributes($uid, } if ($newAvatar !== null) { - $image = new \OCP\Image(); - $fileData = file_get_contents($newAvatar); - $image->loadFromData($fileData); - $this->setOwnCloudAvatar($uid, $image); - } + $image = new \OCP\Image(); + $fileData = file_get_contents($newAvatar); + $image->loadFromData($fileData); + $this->setOwnCloudAvatar($uid, $image); + } } } - private function setOwnCloudAvatar($uid, $image) { - if (!$image->valid()) { - $this->logger->debug('avatar image data from LDAP invalid for ' . $uid); - return false; - } - - - //make sure it is a square and not bigger than 128x128 - $size = min([$image->width(), $image->height(), 128]); - if (!$image->centerCrop($size)) { - $this->logger->debug('croping image for avatar failed for ' . $uid); - return false; - } - - $fs = new FilesystemHelper(); - if (!$fs->isLoaded()) { - $fs->setup($uid); - } - - try { - $avatarManager = \OC::$server->getAvatarManager(); - - $avatar = $avatarManager->getAvatar($uid); - $avatar->set($image); - return true; - } catch (\Exception $e) { - $this->logger->logException($e, [ - 'message' => 'Could not set avatar for ' . $uid, - 'level' => ILogger::INFO, - 'app' => 'user_saml', - ]); - } - return false; - } + private function setOwnCloudAvatar($uid, $image) { + if (!$image->valid()) { + $this->logger->debug('avatar image data from LDAP invalid for ' . $uid); + return false; + } + + + //make sure it is a square and not bigger than 128x128 + $size = min([$image->width(), $image->height(), 128]); + if (!$image->centerCrop($size)) { + $this->logger->debug('croping image for avatar failed for ' . $uid); + return false; + } + + $fs = new FilesystemHelper(); + if (!$fs->isLoaded()) { + $fs->setup($uid); + } + + try { + $avatarManager = \OC::$server->getAvatarManager(); + + $avatar = $avatarManager->getAvatar($uid); + $avatar->set($image); + return true; + } catch (\Exception $e) { + $this->logger->logException($e, [ + 'message' => 'Could not set avatar for ' . $uid, + 'level' => ILogger::INFO, + 'app' => 'user_saml', + ]); + } + return false; + } From 7ef05292ffd80639029fce5031dbbe65175c5fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Se=C3=9Fner?= Date: Mon, 17 May 2021 19:13:54 +0200 Subject: [PATCH 08/38] Replace LDAP FilesystemHelper with native methods MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philipp Seßner --- lib/UserBackend.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/UserBackend.php b/lib/UserBackend.php index 3dbf7a462..7f97f41b8 100644 --- a/lib/UserBackend.php +++ b/lib/UserBackend.php @@ -21,8 +21,8 @@ namespace OCA\User_SAML; +use OC\Files\Filesystem; use OC\User\Backend; -use OCA\User_LDAP\FilesystemHelper; use OCP\Authentication\IApacheBackend; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\Files\NotPermittedException; @@ -734,9 +734,8 @@ private function setOwnCloudAvatar($uid, $image) { return false; } - $fs = new FilesystemHelper(); - if (!$fs->isLoaded()) { - $fs->setup($uid); + if (Filesystem::$loaded) { + \OC_Util::setupFS($uid); } try { From e03bdfee86e84d2cc5a366d15a0a4d5558a3ba5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Se=C3=9Fner?= Date: Mon, 17 May 2021 19:19:30 +0200 Subject: [PATCH 09/38] Minor refactoring of if statement when checking if a user can change their avatar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philipp Seßner --- lib/UserBackend.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/UserBackend.php b/lib/UserBackend.php index 7f97f41b8..432e8ee8d 100644 --- a/lib/UserBackend.php +++ b/lib/UserBackend.php @@ -95,14 +95,10 @@ public function canChangeAvatar($uid) { return true; } try { - if (empty(trim($this->getAttributeKeys('saml-attribute-mapping-avatar_mapping')[0]))) { - return true; - } + return empty(trim($this->getAttributeKeys('saml-attribute-mapping-avatar_mapping')[0])); } catch(\InvalidArgumentException $e) { return true; } - - return false; } /** From c448062cf8d109d97c5f5210a159867bdcf7624f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Se=C3=9Fner?= Date: Mon, 17 May 2021 19:44:12 +0200 Subject: [PATCH 10/38] Give method to set the avatar from SAML a more speaking name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philipp Seßner --- lib/UserBackend.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/UserBackend.php b/lib/UserBackend.php index 432e8ee8d..7ba746201 100644 --- a/lib/UserBackend.php +++ b/lib/UserBackend.php @@ -711,12 +711,12 @@ public function updateAttributes($uid, $image = new \OCP\Image(); $fileData = file_get_contents($newAvatar); $image->loadFromData($fileData); - $this->setOwnCloudAvatar($uid, $image); + $this->setAvatarFromSamlProvider($uid, $image); } } } - private function setOwnCloudAvatar($uid, $image) { + private function setAvatarFromSamlProvider($uid, $image) { if (!$image->valid()) { $this->logger->debug('avatar image data from LDAP invalid for ' . $uid); return false; From 1252b40857de2497c2047e54e617727444c5eea5 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 26 Mar 2021 03:26:08 +0000 Subject: [PATCH 11/38] [tx-robot] updated from transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nextcloud bot Signed-off-by: Philipp Seßner --- l10n/da.js | 1 + l10n/da.json | 1 + 2 files changed, 2 insertions(+) diff --git a/l10n/da.js b/l10n/da.js index 726651276..7bc0d8f71 100644 --- a/l10n/da.js +++ b/l10n/da.js @@ -36,6 +36,7 @@ OC.L10N.register( "Configure your IdP settings here." : "Indstil IdP her.", "Security settings" : "Sikkerhedsindstillinger", "Download metadata XML" : "Download metadata XML", + "Reset settings" : "Nulstil indstillinger", "Metadata invalid" : "Ugyldig metadata", "Metadata valid" : "Gyldig metadata", "Error" : "Fejl" diff --git a/l10n/da.json b/l10n/da.json index b3bd03f60..567264cd2 100644 --- a/l10n/da.json +++ b/l10n/da.json @@ -34,6 +34,7 @@ "Configure your IdP settings here." : "Indstil IdP her.", "Security settings" : "Sikkerhedsindstillinger", "Download metadata XML" : "Download metadata XML", + "Reset settings" : "Nulstil indstillinger", "Metadata invalid" : "Ugyldig metadata", "Metadata valid" : "Gyldig metadata", "Error" : "Fejl" From e0546efcdcdc75e88e6f3c477ba553c1e3bab6d0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 27 Mar 2021 02:13:18 +0000 Subject: [PATCH 12/38] Bump guzzlehttp/guzzle from 7.0.1 to 7.3.0 in /tests/integration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 7.0.1 to 7.3.0. - [Release notes](https://github.com/guzzle/guzzle/releases) - [Changelog](https://github.com/guzzle/guzzle/blob/master/CHANGELOG.md) - [Commits](https://github.com/guzzle/guzzle/compare/7.0.1...7.3.0) Signed-off-by: dependabot-preview[bot] Signed-off-by: Philipp Seßner --- tests/integration/composer.lock | 72 ++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 27 deletions(-) diff --git a/tests/integration/composer.lock b/tests/integration/composer.lock index fb188eda6..0d86ddb97 100644 --- a/tests/integration/composer.lock +++ b/tests/integration/composer.lock @@ -193,33 +193,33 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.0.1", + "version": "7.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "2d9d3c186a6637a43193e66b097c50e4451eaab2" + "reference": "7008573787b430c1c1f650e3722d9bba59967628" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/2d9d3c186a6637a43193e66b097c50e4451eaab2", - "reference": "2d9d3c186a6637a43193e66b097c50e4451eaab2", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7008573787b430c1c1f650e3722d9bba59967628", + "reference": "7008573787b430c1c1f650e3722d9bba59967628", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.6.1", - "php": "^7.2.5", + "guzzlehttp/promises": "^1.4", + "guzzlehttp/psr7": "^1.7 || ^2.0", + "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0" }, "provide": { "psr/http-client-implementation": "1.0" }, "require-dev": { - "ergebnis/composer-normalize": "^2.0", + "bamarni/composer-bin-plugin": "^1.4.1", "ext-curl": "*", - "php-http/client-integration-tests": "dev-phpunit8", - "phpunit/phpunit": "^8.5.5", + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^8.5.5 || ^9.3.5", "psr/log": "^1.1" }, "suggest": { @@ -230,7 +230,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "7.0-dev" + "dev-master": "7.3-dev" } }, "autoload": { @@ -270,27 +270,45 @@ "rest", "web service" ], - "time": "2020-06-27T10:33:25+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://github.com/alexeyshockov", + "type": "github" + }, + { + "url": "https://github.com/gmponos", + "type": "github" + } + ], + "time": "2021-03-23T11:33:13+00:00" }, { "name": "guzzlehttp/promises", - "version": "v1.3.1", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646" + "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646", - "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646", + "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d", + "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d", "shasum": "" }, "require": { - "php": ">=5.5.0" + "php": ">=5.5" }, "require-dev": { - "phpunit/phpunit": "^4.0" + "symfony/phpunit-bridge": "^4.4 || ^5.1" }, "type": "library", "extra": { @@ -321,20 +339,20 @@ "keywords": [ "promise" ], - "time": "2016-12-20T10:07:11+00:00" + "time": "2021-03-07T09:25:29+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.6.1", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "239400de7a173fe9901b9ac7c06497751f00727a" + "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a", - "reference": "239400de7a173fe9901b9ac7c06497751f00727a", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/35ea11d335fd638b5882ff1725228b3d35496ab1", + "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1", "shasum": "" }, "require": { @@ -347,15 +365,15 @@ }, "require-dev": { "ext-zlib": "*", - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" }, "suggest": { - "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses" + "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6-dev" + "dev-master": "1.7-dev" } }, "autoload": { @@ -392,7 +410,7 @@ "uri", "url" ], - "time": "2019-07-01T23:21:34+00:00" + "time": "2021-03-21T16:25:00+00:00" }, { "name": "psr/container", From 6caa617b2ba6e1e94b7a64468ab7fbc1253943f2 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Wed, 31 Mar 2021 03:27:22 +0000 Subject: [PATCH 13/38] [tx-robot] updated from transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nextcloud bot Signed-off-by: Philipp Seßner --- l10n/hu.js | 20 +++++++++++++++++++- l10n/hu.json | 20 +++++++++++++++++++- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/l10n/hu.js b/l10n/hu.js index c45a8d435..aac2f9f49 100644 --- a/l10n/hu.js +++ b/l10n/hu.js @@ -7,6 +7,7 @@ OC.L10N.register( "Unknown error, please check the log file for more details." : "Ismeretlen hiba, kérlek ellenőrizd a log fájlokat további részletekért.", "Direct log in" : "Közvetlen belépés", "SSO & SAML log in" : "SSO & SAML belépés", + "This page should not be visited directly." : "Ezt az oldalt nem kellene közvetlenül meglátogatni.", "Provider " : "Szolgáltató", "X.509 certificate of the Service Provider" : "Szolgáltató X.509 tanúsítványa", "Private key of the Service Provider" : "Szolgáltató titkos kulcsa", @@ -22,35 +23,50 @@ OC.L10N.register( "Indicates a requirement for the NameID received by this SP to be encrypted." : "Jelzi, hogy az SP által fogadott NameID titkosítva lesznek-e.", "Indicates if the SP will validate all received XML." : "Mutatja ha az SP validálja az összes fogadott XML-t.", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "Az ADFS kisbetűvel URL-kódolja a SAML adatokat, és az eszköz alapértelmezetten nagybetűket használ. Kapcsold be az ADFS kompatibilitáshoz az aláírás ellenőrzéskor.", + "Algorithm that the toolkit will use on signing process." : "Algoritmus, amelyet az eszközkészlet használni fog az aláírási folyamat során.", "Attribute to map the UID to." : "Attribútum melyre az UID leképeződik.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Csak akkor engedd a hitelesítést, ha egy másik háttérszolgáltatásban is létezik a fiók. (pl: LDAP)", "Attribute to map the displayname to." : "Attribútum melyre az megjelenítendő név leképeződik.", "Attribute to map the email address to." : "Attribútum melyre az e-mail leképeződik.", "Attribute to map the quota to." : "Attribútum melyhez a kvóta hozzárendelődik.", + "Attribute to map the users groups to." : "Attribútum, amelyhez a felhasználói csoportokat hozzárendeli.", + "Attribute to map the users home to." : "Attribútum, amellyel hozzárendeljük a felhasználók mappát.", "Email address" : "E-mail cím", "Encrypted" : "Tikosítva", + "Entity" : "Entitás", "Kerberos" : "Kerberos", + "Persistent" : "Megmaradó", + "Transient" : "Átmeneti", "Unspecified" : "Nem meghatározott", "Windows domain qualified name" : "Windows tartományi név", + "X509 subject name" : "X509 tárgy neve", "Use SAML auth for the %s desktop clients (requires user re-authentication)" : "SAML használata %s asztali kliens hitelesítés (felhasználók ismételt bejelentkezését igényli)", + "Optional display name of the identity provider (default: \"SSO & SAML log in\")" : "Az identitásszolgáltató opcionális megjelenítési neve (alapértelmezett: \"SSO és SAML bejelentkezés\")", "Allow the use of multiple user back-ends (e.g. LDAP)" : "Megengedi, hogy a felhasználó több back-endet is használjon (pl.: LDAP)", "SSO & SAML authentication" : "SSO & SAML hitelesítés", "Authenticate using single sign-on" : "Hitelesítés egyszeri belépéssel", + "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix." : "A Nextcloud SSO és SAML alkalmazásával könnyen lehetővé teheti meglévő egyszeri bejelentkezéses megoldás integrálását a Nextcloudba. Ezenkívül a Nextcloud LDAP felhasználói szolgáltatót is használhatja a felhasználók kényelmének megőrzése érdekében. (pl. megosztáskor)\nA következő szolgáltatók támogatottak és teszteltek jelenleg:\n* ** SAML 2.0 **\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* ** Hitelesítés környezeti változón keresztül **\n\t* Kerberos (mod_auth_kerb)\n\t* Bármely más szolgáltató, amely a környezeti változó segítségével hitelesít\n\nNoha elméletileg bármely hitelesítésszolgáltató működik, amely kompatibilis az itt felsorolt szabványokkal, szeretnénk megjegyezni, hogy ezek nem tartoznak egyetlen belső tesztmátrixba sem.", "Open documentation" : "Dokumentáció megnyitása", + "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you enabled \"%s\" or you go directly to the URL %s." : "Ügyeljen arra, hogy konfiguráljon egy adminisztrátori felhasználót, amely hozzáférhet a példányhoz az SSO-n keresztül. A szokásos %s fiókjával már nem lehet bejelentkezni, hacsak nem engedélyezte a(z) \"%s\" lehetőséget, vagy közvetlenül a %s URL-re lép.", + "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you go directly to the URL %s." : "Ügyeljen arra, hogy konfiguráljon egy adminisztrátori felhasználót, amely hozzáférhet a példányhoz az egyszeri bejelentkezésen keresztül. A szokásos %s fiókjával már nem lehet bejelentkezni, hacsak nem közvetlenül a(z) %s URL-re megy.", "Please choose whether you want to authenticate using the SAML provider built-in in Nextcloud or whether you want to authenticate against an environment variable." : "Kélek válassz, hogy a Nextcloud-ba épített SAML szolgáltató vagy egy környezeti változó ellenében szeretnél bejelentkeztetni.", "Use built-in SAML authentication" : "Használd a beépített SAML hitelesítés", "Use environment variable" : "Használd a környezeti változót", "Global settings" : "Globális beállítások", + "Remove identity provider" : "Azonosítás szolgáltató eltávolítása", + "Add identity provider" : "Azonosítás szolgáltató hozzáadása", "General" : "Általános", "Service Provider Data" : "Szolgáltató adatok", "If your Service Provider should use certificates you can optionally specify them here." : "Ha a szolgáltatód tanúsítványokat kellene használjon, megadhatod azokat.", "Show Service Provider settings…" : "Szolgáltató beállításainak mutatása…", + "Name ID format" : "Név azonosító formátum", "Identity Provider Data" : "Azonosítási szolgáltató adatai", "Configure your IdP settings here." : "IdP beállításaid.", "Identifier of the IdP entity (must be a URI)" : "IdP bejegyzés azonosítója (URI kell legyen)", "URL Target of the IdP where the SP will send the Authentication Request Message" : "IdP URL célja ahova SP küldi a bejelentkezés kérési üzeneteit", "Show optional Identity Provider settings…" : "Kiegészítő identitás szolgáltató beállításai…", "URL Location of the IdP where the SP will send the SLO Request" : "Az IdP URL-je ahova az SP küldi az SLO kérést", + "URL Location of the IDP's SLO Response" : "Az IDP SLO válaszának URL-címe", "Public X.509 certificate of the IdP" : " IdP nyilvános X.509 tanúsítványa", "Attribute mapping" : "Attribútum összekötés", "If you want to optionally map attributes to the user you can configure these here." : "Ha opcionális attribútumokat szeretnél rendelni a felhasználóhoz, itt megteheted.", @@ -66,6 +82,8 @@ OC.L10N.register( "Metadata valid" : "Érvényes metaadat", "Error" : "Hiba", "Account not provisioned." : "Nem felügyelt fiók.", - "Your account is not provisioned, access to this service is thus not possible." : "A fiókod nincs engedélyezve, így ehhez a szolgáltatáshoz nem férhetsz hozzá." + "Your account is not provisioned, access to this service is thus not possible." : "A fiókod nincs engedélyezve, így ehhez a szolgáltatáshoz nem férhetsz hozzá.", + "Login options:" : "Bejelentkezés lehetőségei:", + "Choose a authentication provider" : "Válasszon hitelesítési szolgáltatót" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/hu.json b/l10n/hu.json index 6a781be36..1641f163d 100644 --- a/l10n/hu.json +++ b/l10n/hu.json @@ -5,6 +5,7 @@ "Unknown error, please check the log file for more details." : "Ismeretlen hiba, kérlek ellenőrizd a log fájlokat további részletekért.", "Direct log in" : "Közvetlen belépés", "SSO & SAML log in" : "SSO & SAML belépés", + "This page should not be visited directly." : "Ezt az oldalt nem kellene közvetlenül meglátogatni.", "Provider " : "Szolgáltató", "X.509 certificate of the Service Provider" : "Szolgáltató X.509 tanúsítványa", "Private key of the Service Provider" : "Szolgáltató titkos kulcsa", @@ -20,35 +21,50 @@ "Indicates a requirement for the NameID received by this SP to be encrypted." : "Jelzi, hogy az SP által fogadott NameID titkosítva lesznek-e.", "Indicates if the SP will validate all received XML." : "Mutatja ha az SP validálja az összes fogadott XML-t.", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "Az ADFS kisbetűvel URL-kódolja a SAML adatokat, és az eszköz alapértelmezetten nagybetűket használ. Kapcsold be az ADFS kompatibilitáshoz az aláírás ellenőrzéskor.", + "Algorithm that the toolkit will use on signing process." : "Algoritmus, amelyet az eszközkészlet használni fog az aláírási folyamat során.", "Attribute to map the UID to." : "Attribútum melyre az UID leképeződik.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Csak akkor engedd a hitelesítést, ha egy másik háttérszolgáltatásban is létezik a fiók. (pl: LDAP)", "Attribute to map the displayname to." : "Attribútum melyre az megjelenítendő név leképeződik.", "Attribute to map the email address to." : "Attribútum melyre az e-mail leképeződik.", "Attribute to map the quota to." : "Attribútum melyhez a kvóta hozzárendelődik.", + "Attribute to map the users groups to." : "Attribútum, amelyhez a felhasználói csoportokat hozzárendeli.", + "Attribute to map the users home to." : "Attribútum, amellyel hozzárendeljük a felhasználók mappát.", "Email address" : "E-mail cím", "Encrypted" : "Tikosítva", + "Entity" : "Entitás", "Kerberos" : "Kerberos", + "Persistent" : "Megmaradó", + "Transient" : "Átmeneti", "Unspecified" : "Nem meghatározott", "Windows domain qualified name" : "Windows tartományi név", + "X509 subject name" : "X509 tárgy neve", "Use SAML auth for the %s desktop clients (requires user re-authentication)" : "SAML használata %s asztali kliens hitelesítés (felhasználók ismételt bejelentkezését igényli)", + "Optional display name of the identity provider (default: \"SSO & SAML log in\")" : "Az identitásszolgáltató opcionális megjelenítési neve (alapértelmezett: \"SSO és SAML bejelentkezés\")", "Allow the use of multiple user back-ends (e.g. LDAP)" : "Megengedi, hogy a felhasználó több back-endet is használjon (pl.: LDAP)", "SSO & SAML authentication" : "SSO & SAML hitelesítés", "Authenticate using single sign-on" : "Hitelesítés egyszeri belépéssel", + "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix." : "A Nextcloud SSO és SAML alkalmazásával könnyen lehetővé teheti meglévő egyszeri bejelentkezéses megoldás integrálását a Nextcloudba. Ezenkívül a Nextcloud LDAP felhasználói szolgáltatót is használhatja a felhasználók kényelmének megőrzése érdekében. (pl. megosztáskor)\nA következő szolgáltatók támogatottak és teszteltek jelenleg:\n* ** SAML 2.0 **\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* ** Hitelesítés környezeti változón keresztül **\n\t* Kerberos (mod_auth_kerb)\n\t* Bármely más szolgáltató, amely a környezeti változó segítségével hitelesít\n\nNoha elméletileg bármely hitelesítésszolgáltató működik, amely kompatibilis az itt felsorolt szabványokkal, szeretnénk megjegyezni, hogy ezek nem tartoznak egyetlen belső tesztmátrixba sem.", "Open documentation" : "Dokumentáció megnyitása", + "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you enabled \"%s\" or you go directly to the URL %s." : "Ügyeljen arra, hogy konfiguráljon egy adminisztrátori felhasználót, amely hozzáférhet a példányhoz az SSO-n keresztül. A szokásos %s fiókjával már nem lehet bejelentkezni, hacsak nem engedélyezte a(z) \"%s\" lehetőséget, vagy közvetlenül a %s URL-re lép.", + "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you go directly to the URL %s." : "Ügyeljen arra, hogy konfiguráljon egy adminisztrátori felhasználót, amely hozzáférhet a példányhoz az egyszeri bejelentkezésen keresztül. A szokásos %s fiókjával már nem lehet bejelentkezni, hacsak nem közvetlenül a(z) %s URL-re megy.", "Please choose whether you want to authenticate using the SAML provider built-in in Nextcloud or whether you want to authenticate against an environment variable." : "Kélek válassz, hogy a Nextcloud-ba épített SAML szolgáltató vagy egy környezeti változó ellenében szeretnél bejelentkeztetni.", "Use built-in SAML authentication" : "Használd a beépített SAML hitelesítés", "Use environment variable" : "Használd a környezeti változót", "Global settings" : "Globális beállítások", + "Remove identity provider" : "Azonosítás szolgáltató eltávolítása", + "Add identity provider" : "Azonosítás szolgáltató hozzáadása", "General" : "Általános", "Service Provider Data" : "Szolgáltató adatok", "If your Service Provider should use certificates you can optionally specify them here." : "Ha a szolgáltatód tanúsítványokat kellene használjon, megadhatod azokat.", "Show Service Provider settings…" : "Szolgáltató beállításainak mutatása…", + "Name ID format" : "Név azonosító formátum", "Identity Provider Data" : "Azonosítási szolgáltató adatai", "Configure your IdP settings here." : "IdP beállításaid.", "Identifier of the IdP entity (must be a URI)" : "IdP bejegyzés azonosítója (URI kell legyen)", "URL Target of the IdP where the SP will send the Authentication Request Message" : "IdP URL célja ahova SP küldi a bejelentkezés kérési üzeneteit", "Show optional Identity Provider settings…" : "Kiegészítő identitás szolgáltató beállításai…", "URL Location of the IdP where the SP will send the SLO Request" : "Az IdP URL-je ahova az SP küldi az SLO kérést", + "URL Location of the IDP's SLO Response" : "Az IDP SLO válaszának URL-címe", "Public X.509 certificate of the IdP" : " IdP nyilvános X.509 tanúsítványa", "Attribute mapping" : "Attribútum összekötés", "If you want to optionally map attributes to the user you can configure these here." : "Ha opcionális attribútumokat szeretnél rendelni a felhasználóhoz, itt megteheted.", @@ -64,6 +80,8 @@ "Metadata valid" : "Érvényes metaadat", "Error" : "Hiba", "Account not provisioned." : "Nem felügyelt fiók.", - "Your account is not provisioned, access to this service is thus not possible." : "A fiókod nincs engedélyezve, így ehhez a szolgáltatáshoz nem férhetsz hozzá." + "Your account is not provisioned, access to this service is thus not possible." : "A fiókod nincs engedélyezve, így ehhez a szolgáltatáshoz nem férhetsz hozzá.", + "Login options:" : "Bejelentkezés lehetőségei:", + "Choose a authentication provider" : "Válasszon hitelesítési szolgáltatót" },"pluralForm" :"nplurals=2; plural=(n != 1);" } \ No newline at end of file From c7517bdd981f5c86ef6175ea0305d20a73c81bd8 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sun, 4 Apr 2021 03:25:04 +0000 Subject: [PATCH 14/38] [tx-robot] updated from transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nextcloud bot Signed-off-by: Philipp Seßner --- l10n/zh_HK.js | 10 +++++----- l10n/zh_HK.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js index afc0d4f1c..0b44efcfb 100644 --- a/l10n/zh_HK.js +++ b/l10n/zh_HK.js @@ -45,7 +45,7 @@ OC.L10N.register( "Allow the use of multiple user back-ends (e.g. LDAP)" : "允許使用多個用戶後端（例如 LDAP）", "SSO & SAML authentication" : "SSO & SAML 認證", "Authenticate using single sign-on" : "使用單點登入認證", - "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix." : "使用 Nextcloud 的 SSO 和 SAML 應用程式，您可以輕鬆地將現有的單點登入解決方案與 Nextcloud 集成。此外，您可以使用 Nextcloud LDAP 用戶提供程序為用戶（例如，共享時）提供便利。\n\n目前支持以下提供程序：\n\n*** SAML 2。0 **\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory聯合身分驗證服務（ADFS）\n\n* **通過環境變量驗證**\n\t* Kerberos（mod_auth_kerb）\n\t*使用環境變量進行身分驗證的任何其他提供程序\n\n從理論上講，實現上述標準之一的任何其他身分驗證提供程序都是兼容的，但我們要指出的是，它們不屬於任何內部測試矩陣。", + "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix." : "使用 Nextcloud 的 SSO 和 SAML 應用程式，您可以輕鬆地將現有的單點登入解決方案與 Nextcloud 集成。此外，您可以使用 Nextcloud LDAP 用戶提供程序為用戶（例如，共享時）提供便利。\n\n目前支持以下提供程序：\n\n*** SAML 2.0 **\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory聯合身分驗證服務（ADFS）\n\n* **通過環境變量驗證**\n\t* Kerberos（mod_auth_kerb）\n\t*使用環境變量進行身分驗證的任何其他提供程序\n\n從理論上講，實現上述標準之一的任何其他身分驗證提供程序都是兼容的，但我們要指出的是，它們不屬於任何內部測試矩陣。", "Open documentation" : "打開文檔", "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you enabled \"%s\" or you go directly to the URL %s." : "請確保設置一個能通過SSO訪問實例的管理員用戶。您將無法使用您的普通 %s 賬號登入，除非您啟用 \"%s\" 或直接訪問URL %s。", "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you go directly to the URL %s." : "請確保設置一個能通過SSO訪問實例的管理員用戶。您將無法使用您的普通 %s 賬號登入，除非您直接訪問URL %s。", @@ -58,22 +58,22 @@ OC.L10N.register( "General" : "常規", "Service Provider Data" : "服務提供者（Service Provider）資料", "If your Service Provider should use certificates you can optionally specify them here." : "如果您的服務提供商使用證書，您可以在這裡選擇指定。", - "Show Service Provider settings…" : "顯示伺服器供應商設置。。。", + "Show Service Provider settings…" : "顯示伺服器供應商設置...", "Name ID format" : "名稱ID格式", "Identity Provider Data" : "身分提供者（IdP）資料", "Configure your IdP settings here." : "在這裡配置您的 ldP 設置。", "Identifier of the IdP entity (must be a URI)" : "IdP 實體的標識符（必須是URI）", "URL Target of the IdP where the SP will send the Authentication Request Message" : "URL 的目標，其中 SP 將發送驗證請求消息", - "Show optional Identity Provider settings…" : "顯示可選的身分提供者設置。。。", + "Show optional Identity Provider settings…" : "顯示可選的身分提供者設置...", "URL Location of the IdP where the SP will send the SLO Request" : "URL 在 SP 發送 SLO 請求的 IdP 的位置", "URL Location of the IDP's SLO Response" : "IDP 的 SLO 響應的 URL 位置", "Public X.509 certificate of the IdP" : "公共 X。509 證書的 IdP", "Attribute mapping" : "屬性映射", "If you want to optionally map attributes to the user you can configure these here." : "如果要選擇將屬性映射到用戶，可以在這裡配置。", - "Show attribute mapping settings…" : "顯示屬性映射設置。。。", + "Show attribute mapping settings…" : "顯示屬性映射設置...", "Security settings" : "安全設置", "For increased security we recommend enabling the following settings if supported by your environment." : "為了提升安全性，如果您的環境支持，建議啟用以下設置。", - "Show security settings…" : "顯示安全設置。。。", + "Show security settings…" : "顯示安全設置...", "Signatures and encryption offered" : "提供簽名和加密", "Signatures and encryption required" : "需要簽名和加密", "Download metadata XML" : "下載元數據 XML", diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json index d77fa38a6..730b7ce6f 100644 --- a/l10n/zh_HK.json +++ b/l10n/zh_HK.json @@ -43,7 +43,7 @@ "Allow the use of multiple user back-ends (e.g. LDAP)" : "允許使用多個用戶後端（例如 LDAP）", "SSO & SAML authentication" : "SSO & SAML 認證", "Authenticate using single sign-on" : "使用單點登入認證", - "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix." : "使用 Nextcloud 的 SSO 和 SAML 應用程式，您可以輕鬆地將現有的單點登入解決方案與 Nextcloud 集成。此外，您可以使用 Nextcloud LDAP 用戶提供程序為用戶（例如，共享時）提供便利。\n\n目前支持以下提供程序：\n\n*** SAML 2。0 **\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory聯合身分驗證服務（ADFS）\n\n* **通過環境變量驗證**\n\t* Kerberos（mod_auth_kerb）\n\t*使用環境變量進行身分驗證的任何其他提供程序\n\n從理論上講，實現上述標準之一的任何其他身分驗證提供程序都是兼容的，但我們要指出的是，它們不屬於任何內部測試矩陣。", + "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix." : "使用 Nextcloud 的 SSO 和 SAML 應用程式，您可以輕鬆地將現有的單點登入解決方案與 Nextcloud 集成。此外，您可以使用 Nextcloud LDAP 用戶提供程序為用戶（例如，共享時）提供便利。\n\n目前支持以下提供程序：\n\n*** SAML 2.0 **\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory聯合身分驗證服務（ADFS）\n\n* **通過環境變量驗證**\n\t* Kerberos（mod_auth_kerb）\n\t*使用環境變量進行身分驗證的任何其他提供程序\n\n從理論上講，實現上述標準之一的任何其他身分驗證提供程序都是兼容的，但我們要指出的是，它們不屬於任何內部測試矩陣。", "Open documentation" : "打開文檔", "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you enabled \"%s\" or you go directly to the URL %s." : "請確保設置一個能通過SSO訪問實例的管理員用戶。您將無法使用您的普通 %s 賬號登入，除非您啟用 \"%s\" 或直接訪問URL %s。", "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you go directly to the URL %s." : "請確保設置一個能通過SSO訪問實例的管理員用戶。您將無法使用您的普通 %s 賬號登入，除非您直接訪問URL %s。", @@ -56,22 +56,22 @@ "General" : "常規", "Service Provider Data" : "服務提供者（Service Provider）資料", "If your Service Provider should use certificates you can optionally specify them here." : "如果您的服務提供商使用證書，您可以在這裡選擇指定。", - "Show Service Provider settings…" : "顯示伺服器供應商設置。。。", + "Show Service Provider settings…" : "顯示伺服器供應商設置...", "Name ID format" : "名稱ID格式", "Identity Provider Data" : "身分提供者（IdP）資料", "Configure your IdP settings here." : "在這裡配置您的 ldP 設置。", "Identifier of the IdP entity (must be a URI)" : "IdP 實體的標識符（必須是URI）", "URL Target of the IdP where the SP will send the Authentication Request Message" : "URL 的目標，其中 SP 將發送驗證請求消息", - "Show optional Identity Provider settings…" : "顯示可選的身分提供者設置。。。", + "Show optional Identity Provider settings…" : "顯示可選的身分提供者設置...", "URL Location of the IdP where the SP will send the SLO Request" : "URL 在 SP 發送 SLO 請求的 IdP 的位置", "URL Location of the IDP's SLO Response" : "IDP 的 SLO 響應的 URL 位置", "Public X.509 certificate of the IdP" : "公共 X。509 證書的 IdP", "Attribute mapping" : "屬性映射", "If you want to optionally map attributes to the user you can configure these here." : "如果要選擇將屬性映射到用戶，可以在這裡配置。", - "Show attribute mapping settings…" : "顯示屬性映射設置。。。", + "Show attribute mapping settings…" : "顯示屬性映射設置...", "Security settings" : "安全設置", "For increased security we recommend enabling the following settings if supported by your environment." : "為了提升安全性，如果您的環境支持，建議啟用以下設置。", - "Show security settings…" : "顯示安全設置。。。", + "Show security settings…" : "顯示安全設置...", "Signatures and encryption offered" : "提供簽名和加密", "Signatures and encryption required" : "需要簽名和加密", "Download metadata XML" : "下載元數據 XML", From fa3416d01442e4f757527e88f8de6bdf8a5a20b3 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Wed, 14 Apr 2021 03:29:25 +0000 Subject: [PATCH 15/38] [tx-robot] updated from transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nextcloud bot Signed-off-by: Philipp Seßner --- l10n/eu.js | 1 + l10n/eu.json | 1 + 2 files changed, 2 insertions(+) diff --git a/l10n/eu.js b/l10n/eu.js index ec225c0cf..627c4563e 100644 --- a/l10n/eu.js +++ b/l10n/eu.js @@ -7,6 +7,7 @@ OC.L10N.register( "Unknown error, please check the log file for more details." : "Errore ezezaguna, mesedez egiaztatu egunkari fitxategia xehetasun gehiagorako.", "Direct log in" : "Saio-hasiera zuzena", "SSO & SAML log in" : "SSO eta SAML saio-hasiera", + "This page should not be visited directly." : "Orri hau ez litzateke zuzenean bisitatu beharko.", "Provider " : "Hornitzailea", "X.509 certificate of the Service Provider" : "Zerbitzu-hornitzailearen X.509 ziurtagiria", "Private key of the Service Provider" : "Zerbitzu-hornitzaileraren gako pribatua", diff --git a/l10n/eu.json b/l10n/eu.json index 5c68397f4..c11dc07cd 100644 --- a/l10n/eu.json +++ b/l10n/eu.json @@ -5,6 +5,7 @@ "Unknown error, please check the log file for more details." : "Errore ezezaguna, mesedez egiaztatu egunkari fitxategia xehetasun gehiagorako.", "Direct log in" : "Saio-hasiera zuzena", "SSO & SAML log in" : "SSO eta SAML saio-hasiera", + "This page should not be visited directly." : "Orri hau ez litzateke zuzenean bisitatu beharko.", "Provider " : "Hornitzailea", "X.509 certificate of the Service Provider" : "Zerbitzu-hornitzailearen X.509 ziurtagiria", "Private key of the Service Provider" : "Zerbitzu-hornitzaileraren gako pribatua", From 469e6005275eaa05ec37508891742a3d28097d6d Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 16 Apr 2021 03:28:26 +0000 Subject: [PATCH 16/38] [tx-robot] updated from transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nextcloud bot Signed-off-by: Philipp Seßner --- l10n/ja.js | 2 ++ l10n/ja.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/l10n/ja.js b/l10n/ja.js index 26275697d..5e4e77ad3 100644 --- a/l10n/ja.js +++ b/l10n/ja.js @@ -66,6 +66,7 @@ OC.L10N.register( "URL Target of the IdP where the SP will send the Authentication Request Message" : "SPが認証要求メッセージを送信するIdPのURLターゲット", "Show optional Identity Provider settings…" : "オプションのIdentity Provider設定を表示する...", "URL Location of the IdP where the SP will send the SLO Request" : "URL SPがSLO要求を送信するIdPの場所", + "URL Location of the IDP's SLO Response" : "IDPがSLOレスポンスを提供するURL", "Public X.509 certificate of the IdP" : "IdPの公開X.509証明書", "Attribute mapping" : "属性マッピング", "If you want to optionally map attributes to the user you can configure these here." : "オプションで属性をユーザーにマップする場合は、ここでそれらを構成できます。", @@ -82,6 +83,7 @@ OC.L10N.register( "Error" : "エラー", "Account not provisioned." : "アカウントがプロビジョニングされていない", "Your account is not provisioned, access to this service is thus not possible." : "アカウントにプロビジョニングされていないため、このサービスへのアクセスはできません。", + "Login options:" : "ログインオプション: ", "Choose a authentication provider" : "認証プロバイダを選択する" }, "nplurals=1; plural=0;"); diff --git a/l10n/ja.json b/l10n/ja.json index 1a6c92ebf..8169760c9 100644 --- a/l10n/ja.json +++ b/l10n/ja.json @@ -64,6 +64,7 @@ "URL Target of the IdP where the SP will send the Authentication Request Message" : "SPが認証要求メッセージを送信するIdPのURLターゲット", "Show optional Identity Provider settings…" : "オプションのIdentity Provider設定を表示する...", "URL Location of the IdP where the SP will send the SLO Request" : "URL SPがSLO要求を送信するIdPの場所", + "URL Location of the IDP's SLO Response" : "IDPがSLOレスポンスを提供するURL", "Public X.509 certificate of the IdP" : "IdPの公開X.509証明書", "Attribute mapping" : "属性マッピング", "If you want to optionally map attributes to the user you can configure these here." : "オプションで属性をユーザーにマップする場合は、ここでそれらを構成できます。", @@ -80,6 +81,7 @@ "Error" : "エラー", "Account not provisioned." : "アカウントがプロビジョニングされていない", "Your account is not provisioned, access to this service is thus not possible." : "アカウントにプロビジョニングされていないため、このサービスへのアクセスはできません。", + "Login options:" : "ログインオプション: ", "Choose a authentication provider" : "認証プロバイダを選択する" },"pluralForm" :"nplurals=1; plural=0;" } \ No newline at end of file From 21cffbab92a21d0efb50558a6dc3f2dd09b2b126 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 23 Apr 2021 03:29:00 +0000 Subject: [PATCH 17/38] [tx-robot] updated from transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nextcloud bot Signed-off-by: Philipp Seßner --- l10n/cs.js | 2 +- l10n/cs.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/l10n/cs.js b/l10n/cs.js index 820862ccf..111b24bce 100644 --- a/l10n/cs.js +++ b/l10n/cs.js @@ -84,6 +84,6 @@ OC.L10N.register( "Account not provisioned." : "Účet není zprovozněn.", "Your account is not provisioned, access to this service is thus not possible." : "Váš účet ještě nebyl zprovozněn, přístup ke službě tedy ještě není možný.", "Login options:" : "Možnosti přihlašování:", - "Choose a authentication provider" : "Zvolte poskytovatele ověřování" + "Choose a authentication provider" : "Zvolte poskytovatele ověřování se" }, "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"); diff --git a/l10n/cs.json b/l10n/cs.json index b21569b84..bf95d1d9b 100644 --- a/l10n/cs.json +++ b/l10n/cs.json @@ -82,6 +82,6 @@ "Account not provisioned." : "Účet není zprovozněn.", "Your account is not provisioned, access to this service is thus not possible." : "Váš účet ještě nebyl zprovozněn, přístup ke službě tedy ještě není možný.", "Login options:" : "Možnosti přihlašování:", - "Choose a authentication provider" : "Zvolte poskytovatele ověřování" + "Choose a authentication provider" : "Zvolte poskytovatele ověřování se" },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;" } \ No newline at end of file From a659c302ca552e0c5d1985ea8b36dff0292a0885 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sat, 24 Apr 2021 03:28:58 +0000 Subject: [PATCH 18/38] [tx-robot] updated from transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nextcloud bot Signed-off-by: Philipp Seßner --- l10n/eu.js | 1 + l10n/eu.json | 1 + 2 files changed, 2 insertions(+) diff --git a/l10n/eu.js b/l10n/eu.js index 627c4563e..c8f372411 100644 --- a/l10n/eu.js +++ b/l10n/eu.js @@ -15,6 +15,7 @@ OC.L10N.register( "Indicates whether the messages sent by this SP will be signed." : "SP honek bidalitako mezuak sinatu behar diren ala ez adierazten du.", "Indicates whether the messages sent by this SP will be signed." : "SP honek bidalitako mezuak sinatu behar diren ala ez adierazten du.", "Whether the metadata should be signed." : "Metadatuek sinatuta egon behar duten ala ez.", + "Attribute to map the UID to." : "UIDa mapatzeko atributua.", "Email address" : "Posta helbidea", "Encrypted" : "Zifratua", "Entity" : "Entitatea", diff --git a/l10n/eu.json b/l10n/eu.json index c11dc07cd..2976a6f4c 100644 --- a/l10n/eu.json +++ b/l10n/eu.json @@ -13,6 +13,7 @@ "Indicates whether the messages sent by this SP will be signed." : "SP honek bidalitako mezuak sinatu behar diren ala ez adierazten du.", "Indicates whether the messages sent by this SP will be signed." : "SP honek bidalitako mezuak sinatu behar diren ala ez adierazten du.", "Whether the metadata should be signed." : "Metadatuek sinatuta egon behar duten ala ez.", + "Attribute to map the UID to." : "UIDa mapatzeko atributua.", "Email address" : "Posta helbidea", "Encrypted" : "Zifratua", "Entity" : "Entitatea", From 4856954695747b952e64853eff91d6b90e25c640 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Tue, 27 Apr 2021 03:29:16 +0000 Subject: [PATCH 19/38] [tx-robot] updated from transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nextcloud bot Signed-off-by: Philipp Seßner --- l10n/de_DE.js | 24 ++++++++++++------------ l10n/de_DE.json | 24 ++++++++++++------------ l10n/eu.js | 1 + l10n/eu.json | 1 + 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/l10n/de_DE.js b/l10n/de_DE.js index 1c1adcbf0..34d9690cb 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -27,7 +27,7 @@ OC.L10N.register( "Attribute to map the UID to." : "Attribut dem die UID zugeordnet werden soll.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Anmeldung nur erlauben, wenn ein Konto auf einem anderen Backend vorhanden ist (z.B. LDAP)", "Attribute to map the displayname to." : "Attribut dem der Anzeigename zugeordnet werden soll.", - "Attribute to map the email address to." : "Attribut dem die E-Mail-Adresse zugeordnet werden soll.", + "Attribute to map the email address to." : "Attribut, dem die E-Mail-Adresse zugeordnet werden soll.", "Attribute to map the quota to." : "Attribut, dem das Speicherkontingent zugeordnet werden soll.", "Attribute to map the users groups to." : "Attribut, dem die Gruppen des Benutzers zugeordnet werden sollen.", "Attribute to map the users home to." : "Attribut dem das zu Hause des Benutzers zugeordnet werden soll.", @@ -51,7 +51,7 @@ OC.L10N.register( "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you enabled \"%s\" or you go directly to the URL %s." : "Es muss ein Benutzer mit Administrator-Rechten vorhanden sein, der sich mittels SSO anmelden kann. Eine Anmeldung mit Ihrem normalen Zugang %s ist dann nicht mehr möglich, außer Sie haben \"%s\" aktiviert oder Sie gehen direkt zur URL %s.", "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you go directly to the URL %s." : "Es muss ein Benutzer mit Administrator-Rechten vorhanden sein, der sich mittels SSO anmelden kann. Eine Anmeldung mit ihrem normalen Zugang %s ist dann nicht mehr möglich, es sei denn, Sie gehen direkt zur URL %s.", "Please choose whether you want to authenticate using the SAML provider built-in in Nextcloud or whether you want to authenticate against an environment variable." : "Bitte auswählen ob die Autorisierung mittels in Nextcloud integriertem SAML oder gegen eine Umgebungsvariable erfolgen soll.", - "Use built-in SAML authentication" : "Integrierte SAML-Autorisierung benutzen", + "Use built-in SAML authentication" : "Integrierte SAML-Authentifizierung benutzen", "Use environment variable" : "Umgebungsvariable benutzen", "Global settings" : "Globale Einstellungen", "Remove identity provider" : "Autorisierungsdienst entfernen", @@ -61,20 +61,20 @@ OC.L10N.register( "If your Service Provider should use certificates you can optionally specify them here." : "Sollte Ihr Diensteanbieter Zertifikate benutzen dann haben Sie hier die Möglichkeit diese anzugeben.", "Show Service Provider settings…" : "Zeige die Diensteanbieter-Einstellungen…", "Name ID format" : "Name-ID-Format", - "Identity Provider Data" : "Daten des Autorisierungsdienstes", - "Configure your IdP settings here." : "Autorisierungsdienst-Einstellungen hier konfigurieren.", - "Identifier of the IdP entity (must be a URI)" : "Identifikationsmerkmal des Autorisierungsdienstes (muss URI sein)", - "URL Target of the IdP where the SP will send the Authentication Request Message" : "URL-Ziel des Autorisierungsdienstes an den der Diensteanbieter die Anmeldungsanfrage senden soll", - "Show optional Identity Provider settings…" : "Zeige optionale Autorisierungsdienst-Einstellungen", - "URL Location of the IdP where the SP will send the SLO Request" : "URL-Adresse des Autorisierungsdienstes an den der Diensteanbieter die SLO-Anfrage senden soll", - "URL Location of the IDP's SLO Response" : "URL-Adresse der SLO-Antwort des Autorisierungsdienstes", - "Public X.509 certificate of the IdP" : "Öffentliches X.509-Zertifikat des Autorisierungsdienstes", + "Identity Provider Data" : "Daten des Identitätsanbieters", + "Configure your IdP settings here." : "Einstellungen des Identitätsanbieters hier konfigurieren.", + "Identifier of the IdP entity (must be a URI)" : "Identifikationsmerkmal des Identitätsanbieters (muss eine URL sein)", + "URL Target of the IdP where the SP will send the Authentication Request Message" : "URL-Ziel des Identitätsanbieters, an den der Diensteanbieter die Anmeldungsanfrage senden soll", + "Show optional Identity Provider settings…" : "Optionale Einstellungen des Identitätsanbieters anzeigen …", + "URL Location of the IdP where the SP will send the SLO Request" : "URL-Adresse des Identitätsanbieters, an den der Diensteanbieter die SLO-Anfrage senden soll", + "URL Location of the IDP's SLO Response" : "URL-Adresse der SLO-Antwort des Identitätsanbieters", + "Public X.509 certificate of the IdP" : "Öffentliches X.509-Zertifikat des Identitätsanbieters", "Attribute mapping" : "Attribute zuordnen", "If you want to optionally map attributes to the user you can configure these here." : "Wenn Sie optional Attribute dem Benutzer zuordnen möchten, können Sie dies hier einstellen.", - "Show attribute mapping settings…" : "Einstellungen der Attribute-Zuordnung anzeigen… ", + "Show attribute mapping settings…" : "Einstellungen der Attribute-Zuordnung anzeigen…", "Security settings" : "Sicherheitseinstellungen", "For increased security we recommend enabling the following settings if supported by your environment." : "Um die Sicherheit zu erhöhen empfehlen wir die nachfolgenden Einstellungen, soweit diese von Ihrer Installation unterstützt werden.", - "Show security settings…" : "Zeige Sicherheitseinstellungen… ", + "Show security settings…" : "Sicherheitseinstellungen anzeigen …", "Signatures and encryption offered" : "Signaturen und Verschlüsselung werden angeboten", "Signatures and encryption required" : "Signaturen und Verschlüsselung erforderlich", "Download metadata XML" : "Lade Metadaten-XML herunter", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index 24475df22..df70a71c2 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -25,7 +25,7 @@ "Attribute to map the UID to." : "Attribut dem die UID zugeordnet werden soll.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Anmeldung nur erlauben, wenn ein Konto auf einem anderen Backend vorhanden ist (z.B. LDAP)", "Attribute to map the displayname to." : "Attribut dem der Anzeigename zugeordnet werden soll.", - "Attribute to map the email address to." : "Attribut dem die E-Mail-Adresse zugeordnet werden soll.", + "Attribute to map the email address to." : "Attribut, dem die E-Mail-Adresse zugeordnet werden soll.", "Attribute to map the quota to." : "Attribut, dem das Speicherkontingent zugeordnet werden soll.", "Attribute to map the users groups to." : "Attribut, dem die Gruppen des Benutzers zugeordnet werden sollen.", "Attribute to map the users home to." : "Attribut dem das zu Hause des Benutzers zugeordnet werden soll.", @@ -49,7 +49,7 @@ "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you enabled \"%s\" or you go directly to the URL %s." : "Es muss ein Benutzer mit Administrator-Rechten vorhanden sein, der sich mittels SSO anmelden kann. Eine Anmeldung mit Ihrem normalen Zugang %s ist dann nicht mehr möglich, außer Sie haben \"%s\" aktiviert oder Sie gehen direkt zur URL %s.", "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you go directly to the URL %s." : "Es muss ein Benutzer mit Administrator-Rechten vorhanden sein, der sich mittels SSO anmelden kann. Eine Anmeldung mit ihrem normalen Zugang %s ist dann nicht mehr möglich, es sei denn, Sie gehen direkt zur URL %s.", "Please choose whether you want to authenticate using the SAML provider built-in in Nextcloud or whether you want to authenticate against an environment variable." : "Bitte auswählen ob die Autorisierung mittels in Nextcloud integriertem SAML oder gegen eine Umgebungsvariable erfolgen soll.", - "Use built-in SAML authentication" : "Integrierte SAML-Autorisierung benutzen", + "Use built-in SAML authentication" : "Integrierte SAML-Authentifizierung benutzen", "Use environment variable" : "Umgebungsvariable benutzen", "Global settings" : "Globale Einstellungen", "Remove identity provider" : "Autorisierungsdienst entfernen", @@ -59,20 +59,20 @@ "If your Service Provider should use certificates you can optionally specify them here." : "Sollte Ihr Diensteanbieter Zertifikate benutzen dann haben Sie hier die Möglichkeit diese anzugeben.", "Show Service Provider settings…" : "Zeige die Diensteanbieter-Einstellungen…", "Name ID format" : "Name-ID-Format", - "Identity Provider Data" : "Daten des Autorisierungsdienstes", - "Configure your IdP settings here." : "Autorisierungsdienst-Einstellungen hier konfigurieren.", - "Identifier of the IdP entity (must be a URI)" : "Identifikationsmerkmal des Autorisierungsdienstes (muss URI sein)", - "URL Target of the IdP where the SP will send the Authentication Request Message" : "URL-Ziel des Autorisierungsdienstes an den der Diensteanbieter die Anmeldungsanfrage senden soll", - "Show optional Identity Provider settings…" : "Zeige optionale Autorisierungsdienst-Einstellungen", - "URL Location of the IdP where the SP will send the SLO Request" : "URL-Adresse des Autorisierungsdienstes an den der Diensteanbieter die SLO-Anfrage senden soll", - "URL Location of the IDP's SLO Response" : "URL-Adresse der SLO-Antwort des Autorisierungsdienstes", - "Public X.509 certificate of the IdP" : "Öffentliches X.509-Zertifikat des Autorisierungsdienstes", + "Identity Provider Data" : "Daten des Identitätsanbieters", + "Configure your IdP settings here." : "Einstellungen des Identitätsanbieters hier konfigurieren.", + "Identifier of the IdP entity (must be a URI)" : "Identifikationsmerkmal des Identitätsanbieters (muss eine URL sein)", + "URL Target of the IdP where the SP will send the Authentication Request Message" : "URL-Ziel des Identitätsanbieters, an den der Diensteanbieter die Anmeldungsanfrage senden soll", + "Show optional Identity Provider settings…" : "Optionale Einstellungen des Identitätsanbieters anzeigen …", + "URL Location of the IdP where the SP will send the SLO Request" : "URL-Adresse des Identitätsanbieters, an den der Diensteanbieter die SLO-Anfrage senden soll", + "URL Location of the IDP's SLO Response" : "URL-Adresse der SLO-Antwort des Identitätsanbieters", + "Public X.509 certificate of the IdP" : "Öffentliches X.509-Zertifikat des Identitätsanbieters", "Attribute mapping" : "Attribute zuordnen", "If you want to optionally map attributes to the user you can configure these here." : "Wenn Sie optional Attribute dem Benutzer zuordnen möchten, können Sie dies hier einstellen.", - "Show attribute mapping settings…" : "Einstellungen der Attribute-Zuordnung anzeigen… ", + "Show attribute mapping settings…" : "Einstellungen der Attribute-Zuordnung anzeigen…", "Security settings" : "Sicherheitseinstellungen", "For increased security we recommend enabling the following settings if supported by your environment." : "Um die Sicherheit zu erhöhen empfehlen wir die nachfolgenden Einstellungen, soweit diese von Ihrer Installation unterstützt werden.", - "Show security settings…" : "Zeige Sicherheitseinstellungen… ", + "Show security settings…" : "Sicherheitseinstellungen anzeigen …", "Signatures and encryption offered" : "Signaturen und Verschlüsselung werden angeboten", "Signatures and encryption required" : "Signaturen und Verschlüsselung erforderlich", "Download metadata XML" : "Lade Metadaten-XML herunter", diff --git a/l10n/eu.js b/l10n/eu.js index c8f372411..c299b370b 100644 --- a/l10n/eu.js +++ b/l10n/eu.js @@ -27,6 +27,7 @@ OC.L10N.register( "Allow the use of multiple user back-ends (e.g. LDAP)" : "Baimendu erabiltzaile atzealde anitzen erabilpena (adib. LDAP)", "SSO & SAML authentication" : "SSO eta SAML autentifikazioa", "Open documentation" : "Ireki dokumentazioa", + "Use built-in SAML authentication" : "Erabili integratutako SAML autentifikazioa", "Use environment variable" : "Erabili inguruneko aldagaia", "Global settings" : "Ezarpen orokorrak", "Remove identity provider" : "Kendu identitate hornitzailea", diff --git a/l10n/eu.json b/l10n/eu.json index 2976a6f4c..39ccedec3 100644 --- a/l10n/eu.json +++ b/l10n/eu.json @@ -25,6 +25,7 @@ "Allow the use of multiple user back-ends (e.g. LDAP)" : "Baimendu erabiltzaile atzealde anitzen erabilpena (adib. LDAP)", "SSO & SAML authentication" : "SSO eta SAML autentifikazioa", "Open documentation" : "Ireki dokumentazioa", + "Use built-in SAML authentication" : "Erabili integratutako SAML autentifikazioa", "Use environment variable" : "Erabili inguruneko aldagaia", "Global settings" : "Ezarpen orokorrak", "Remove identity provider" : "Kendu identitate hornitzailea", From 98482ae8a0c6eb27e0f0a7f86142b340751ac419 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Thu, 29 Apr 2021 03:30:15 +0000 Subject: [PATCH 20/38] [tx-robot] updated from transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nextcloud bot Signed-off-by: Philipp Seßner --- l10n/de_DE.js | 2 +- l10n/de_DE.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/l10n/de_DE.js b/l10n/de_DE.js index 34d9690cb..4aebefbc1 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -71,7 +71,7 @@ OC.L10N.register( "Public X.509 certificate of the IdP" : "Öffentliches X.509-Zertifikat des Identitätsanbieters", "Attribute mapping" : "Attribute zuordnen", "If you want to optionally map attributes to the user you can configure these here." : "Wenn Sie optional Attribute dem Benutzer zuordnen möchten, können Sie dies hier einstellen.", - "Show attribute mapping settings…" : "Einstellungen der Attribute-Zuordnung anzeigen…", + "Show attribute mapping settings…" : "Einstellungen der Attribute-Zuordnung anzeigen …", "Security settings" : "Sicherheitseinstellungen", "For increased security we recommend enabling the following settings if supported by your environment." : "Um die Sicherheit zu erhöhen empfehlen wir die nachfolgenden Einstellungen, soweit diese von Ihrer Installation unterstützt werden.", "Show security settings…" : "Sicherheitseinstellungen anzeigen …", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index df70a71c2..2f1a5cf83 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -69,7 +69,7 @@ "Public X.509 certificate of the IdP" : "Öffentliches X.509-Zertifikat des Identitätsanbieters", "Attribute mapping" : "Attribute zuordnen", "If you want to optionally map attributes to the user you can configure these here." : "Wenn Sie optional Attribute dem Benutzer zuordnen möchten, können Sie dies hier einstellen.", - "Show attribute mapping settings…" : "Einstellungen der Attribute-Zuordnung anzeigen…", + "Show attribute mapping settings…" : "Einstellungen der Attribute-Zuordnung anzeigen …", "Security settings" : "Sicherheitseinstellungen", "For increased security we recommend enabling the following settings if supported by your environment." : "Um die Sicherheit zu erhöhen empfehlen wir die nachfolgenden Einstellungen, soweit diese von Ihrer Installation unterstützt werden.", "Show security settings…" : "Sicherheitseinstellungen anzeigen …", From be234560f16cacbe6ddc6945ad84c8fd348c79cd Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 30 Apr 2021 03:30:48 +0000 Subject: [PATCH 21/38] [tx-robot] updated from transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nextcloud bot Signed-off-by: Philipp Seßner --- l10n/de_DE.js | 12 ++++++------ l10n/de_DE.json | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/l10n/de_DE.js b/l10n/de_DE.js index 4aebefbc1..1a2509630 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -49,16 +49,16 @@ OC.L10N.register( "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix." : "Die SSO & SAML-App ermöglicht es Ihre bereits bestehende Singl-Sign-On-Lösung einfach in Nextcloud zu integrieren. Ausserdem kann der Nextcloud LDAP-Nutzer-Anbieter verwendet werden, um es den Nutzern (z.B. beim eilen) besonders einfach zu machen.\nBislang werden folgende Anbieter unterstützt und sind getestet:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Anmeldung über Umgebungsvariable**\n\t* Kerberos (mod_auth_kerb)\n\t* Alle anderen Anbieter, die die Umgebungsvariable verwenden\n\nObwohl theoretisch jeder andere Anmeldungs-Anbieter der einen der Standards implementiert hat verwendet werden kann, weisen wir darauf hin, dass diese anderen Anbieter nicht in unserer Test-Matrix berücksichtigt werden.", "Open documentation" : "Dokumentation öffnen", "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you enabled \"%s\" or you go directly to the URL %s." : "Es muss ein Benutzer mit Administrator-Rechten vorhanden sein, der sich mittels SSO anmelden kann. Eine Anmeldung mit Ihrem normalen Zugang %s ist dann nicht mehr möglich, außer Sie haben \"%s\" aktiviert oder Sie gehen direkt zur URL %s.", - "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you go directly to the URL %s." : "Es muss ein Benutzer mit Administrator-Rechten vorhanden sein, der sich mittels SSO anmelden kann. Eine Anmeldung mit ihrem normalen Zugang %s ist dann nicht mehr möglich, es sei denn, Sie gehen direkt zur URL %s.", - "Please choose whether you want to authenticate using the SAML provider built-in in Nextcloud or whether you want to authenticate against an environment variable." : "Bitte auswählen ob die Autorisierung mittels in Nextcloud integriertem SAML oder gegen eine Umgebungsvariable erfolgen soll.", + "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you go directly to the URL %s." : "Es muss ein Benutzer mit Administrator-Rechten vorhanden sein, der sich mittels SSO anmelden kann. Eine Anmeldung mit ihrem normalen Konto %s wird nicht mehr möglich, es sei denn, Sie gehen direkt zur URL %s.", + "Please choose whether you want to authenticate using the SAML provider built-in in Nextcloud or whether you want to authenticate against an environment variable." : "Bitte auswählen ob die Authentifizierung mittels in Nextcloud integriertem SAML-Provider oder gegen eine Umgebungsvariable erfolgen soll.", "Use built-in SAML authentication" : "Integrierte SAML-Authentifizierung benutzen", "Use environment variable" : "Umgebungsvariable benutzen", "Global settings" : "Globale Einstellungen", - "Remove identity provider" : "Autorisierungsdienst entfernen", - "Add identity provider" : "Autorisierungsdienst hinzufügen", + "Remove identity provider" : "Identitätsanbieter entfernen", + "Add identity provider" : "Identitätsanbieter hinzufügen", "General" : "Allgemein", "Service Provider Data" : "Diensteanbieter-Daten", - "If your Service Provider should use certificates you can optionally specify them here." : "Sollte Ihr Diensteanbieter Zertifikate benutzen dann haben Sie hier die Möglichkeit diese anzugeben.", + "If your Service Provider should use certificates you can optionally specify them here." : "Wenn Ihr Dienstanbieter Zertifikate verwenden soll, können Sie diese hier optional angeben.", "Show Service Provider settings…" : "Zeige die Diensteanbieter-Einstellungen…", "Name ID format" : "Name-ID-Format", "Identity Provider Data" : "Daten des Identitätsanbieters", @@ -73,7 +73,7 @@ OC.L10N.register( "If you want to optionally map attributes to the user you can configure these here." : "Wenn Sie optional Attribute dem Benutzer zuordnen möchten, können Sie dies hier einstellen.", "Show attribute mapping settings…" : "Einstellungen der Attribute-Zuordnung anzeigen …", "Security settings" : "Sicherheitseinstellungen", - "For increased security we recommend enabling the following settings if supported by your environment." : "Um die Sicherheit zu erhöhen empfehlen wir die nachfolgenden Einstellungen, soweit diese von Ihrer Installation unterstützt werden.", + "For increased security we recommend enabling the following settings if supported by your environment." : "Zur Erhöhung der Sicherheit empfehlen wir, die folgenden Einstellungen zu aktivieren, sofern dies von Ihrer Installation unterstützt wird.", "Show security settings…" : "Sicherheitseinstellungen anzeigen …", "Signatures and encryption offered" : "Signaturen und Verschlüsselung werden angeboten", "Signatures and encryption required" : "Signaturen und Verschlüsselung erforderlich", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index 2f1a5cf83..df6de978c 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -47,16 +47,16 @@ "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix." : "Die SSO & SAML-App ermöglicht es Ihre bereits bestehende Singl-Sign-On-Lösung einfach in Nextcloud zu integrieren. Ausserdem kann der Nextcloud LDAP-Nutzer-Anbieter verwendet werden, um es den Nutzern (z.B. beim eilen) besonders einfach zu machen.\nBislang werden folgende Anbieter unterstützt und sind getestet:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Anmeldung über Umgebungsvariable**\n\t* Kerberos (mod_auth_kerb)\n\t* Alle anderen Anbieter, die die Umgebungsvariable verwenden\n\nObwohl theoretisch jeder andere Anmeldungs-Anbieter der einen der Standards implementiert hat verwendet werden kann, weisen wir darauf hin, dass diese anderen Anbieter nicht in unserer Test-Matrix berücksichtigt werden.", "Open documentation" : "Dokumentation öffnen", "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you enabled \"%s\" or you go directly to the URL %s." : "Es muss ein Benutzer mit Administrator-Rechten vorhanden sein, der sich mittels SSO anmelden kann. Eine Anmeldung mit Ihrem normalen Zugang %s ist dann nicht mehr möglich, außer Sie haben \"%s\" aktiviert oder Sie gehen direkt zur URL %s.", - "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you go directly to the URL %s." : "Es muss ein Benutzer mit Administrator-Rechten vorhanden sein, der sich mittels SSO anmelden kann. Eine Anmeldung mit ihrem normalen Zugang %s ist dann nicht mehr möglich, es sei denn, Sie gehen direkt zur URL %s.", - "Please choose whether you want to authenticate using the SAML provider built-in in Nextcloud or whether you want to authenticate against an environment variable." : "Bitte auswählen ob die Autorisierung mittels in Nextcloud integriertem SAML oder gegen eine Umgebungsvariable erfolgen soll.", + "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you go directly to the URL %s." : "Es muss ein Benutzer mit Administrator-Rechten vorhanden sein, der sich mittels SSO anmelden kann. Eine Anmeldung mit ihrem normalen Konto %s wird nicht mehr möglich, es sei denn, Sie gehen direkt zur URL %s.", + "Please choose whether you want to authenticate using the SAML provider built-in in Nextcloud or whether you want to authenticate against an environment variable." : "Bitte auswählen ob die Authentifizierung mittels in Nextcloud integriertem SAML-Provider oder gegen eine Umgebungsvariable erfolgen soll.", "Use built-in SAML authentication" : "Integrierte SAML-Authentifizierung benutzen", "Use environment variable" : "Umgebungsvariable benutzen", "Global settings" : "Globale Einstellungen", - "Remove identity provider" : "Autorisierungsdienst entfernen", - "Add identity provider" : "Autorisierungsdienst hinzufügen", + "Remove identity provider" : "Identitätsanbieter entfernen", + "Add identity provider" : "Identitätsanbieter hinzufügen", "General" : "Allgemein", "Service Provider Data" : "Diensteanbieter-Daten", - "If your Service Provider should use certificates you can optionally specify them here." : "Sollte Ihr Diensteanbieter Zertifikate benutzen dann haben Sie hier die Möglichkeit diese anzugeben.", + "If your Service Provider should use certificates you can optionally specify them here." : "Wenn Ihr Dienstanbieter Zertifikate verwenden soll, können Sie diese hier optional angeben.", "Show Service Provider settings…" : "Zeige die Diensteanbieter-Einstellungen…", "Name ID format" : "Name-ID-Format", "Identity Provider Data" : "Daten des Identitätsanbieters", @@ -71,7 +71,7 @@ "If you want to optionally map attributes to the user you can configure these here." : "Wenn Sie optional Attribute dem Benutzer zuordnen möchten, können Sie dies hier einstellen.", "Show attribute mapping settings…" : "Einstellungen der Attribute-Zuordnung anzeigen …", "Security settings" : "Sicherheitseinstellungen", - "For increased security we recommend enabling the following settings if supported by your environment." : "Um die Sicherheit zu erhöhen empfehlen wir die nachfolgenden Einstellungen, soweit diese von Ihrer Installation unterstützt werden.", + "For increased security we recommend enabling the following settings if supported by your environment." : "Zur Erhöhung der Sicherheit empfehlen wir, die folgenden Einstellungen zu aktivieren, sofern dies von Ihrer Installation unterstützt wird.", "Show security settings…" : "Sicherheitseinstellungen anzeigen …", "Signatures and encryption offered" : "Signaturen und Verschlüsselung werden angeboten", "Signatures and encryption required" : "Signaturen und Verschlüsselung erforderlich", From 5a60cef430a4350288fa7147bdd289405ba89dce Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Tue, 4 May 2021 03:28:05 +0000 Subject: [PATCH 22/38] [tx-robot] updated from transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nextcloud bot Signed-off-by: Philipp Seßner --- l10n/eu.js | 2 ++ l10n/eu.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/l10n/eu.js b/l10n/eu.js index c299b370b..9b43ae2cd 100644 --- a/l10n/eu.js +++ b/l10n/eu.js @@ -23,6 +23,7 @@ OC.L10N.register( "Persistent" : "Iraunkorra", "Transient" : "Behin-behinekoa", "Unspecified" : "Zehaztu gabea", + "Windows domain qualified name" : "Windows domeinu izen kualifikatua", "X509 subject name" : "X509 gaia", "Allow the use of multiple user back-ends (e.g. LDAP)" : "Baimendu erabiltzaile atzealde anitzen erabilpena (adib. LDAP)", "SSO & SAML authentication" : "SSO eta SAML autentifikazioa", @@ -35,6 +36,7 @@ OC.L10N.register( "General" : "Orokorra", "Service Provider Data" : "Zerbitzu-hornitzailearen datuak", "Show Service Provider settings…" : "Erakutsi zerbitzu hornitzailearen ezarpenak...", + "Name ID format" : "Izen ID formatua", "Identity Provider Data" : "Identitate-hornitzailearen datuak", "Configure your IdP settings here." : "Konfiguratu zure IdP ezarpenak hemen.", "Show optional Identity Provider settings…" : "Erakutsi identitate-hornitzailearen aukerako ezarpenak...", diff --git a/l10n/eu.json b/l10n/eu.json index 39ccedec3..d2e82694f 100644 --- a/l10n/eu.json +++ b/l10n/eu.json @@ -21,6 +21,7 @@ "Persistent" : "Iraunkorra", "Transient" : "Behin-behinekoa", "Unspecified" : "Zehaztu gabea", + "Windows domain qualified name" : "Windows domeinu izen kualifikatua", "X509 subject name" : "X509 gaia", "Allow the use of multiple user back-ends (e.g. LDAP)" : "Baimendu erabiltzaile atzealde anitzen erabilpena (adib. LDAP)", "SSO & SAML authentication" : "SSO eta SAML autentifikazioa", @@ -33,6 +34,7 @@ "General" : "Orokorra", "Service Provider Data" : "Zerbitzu-hornitzailearen datuak", "Show Service Provider settings…" : "Erakutsi zerbitzu hornitzailearen ezarpenak...", + "Name ID format" : "Izen ID formatua", "Identity Provider Data" : "Identitate-hornitzailearen datuak", "Configure your IdP settings here." : "Konfiguratu zure IdP ezarpenak hemen.", "Show optional Identity Provider settings…" : "Erakutsi identitate-hornitzailearen aukerako ezarpenak...", From 8ca57c80bd7aa2de8c6124c95d81ea8f99e0720f Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Tue, 4 May 2021 17:28:58 +0200 Subject: [PATCH 23/38] Allow setting of "retrieveParametersFromServer" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some SAML servers require this type of decoding, otherwise the SLO request fails. Ideally the library would perform both verifications (https://github.com/onelogin/php-saml/issues/466), but it seems upstream doesn't want to perform this change. Until we have considered a better solution for this, this adds a new checkbox that one can configure. Ref https://github.com/nextcloud/user_saml/issues/403 Signed-off-by: Lukas Reschke Signed-off-by: Philipp Seßner --- lib/Controller/SAMLController.php | 10 ++++++++-- lib/SAMLSettings.php | 4 ++++ lib/Settings/Admin.php | 3 ++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/Controller/SAMLController.php b/lib/Controller/SAMLController.php index 61c4cc5b6..dc8b5b801 100644 --- a/lib/Controller/SAMLController.php +++ b/lib/Controller/SAMLController.php @@ -418,8 +418,14 @@ public function singleLogoutService() { $stay = true ; // $auth will return the redirect URL but won't perform the redirect himself if ($isFromIDP) { $keepLocalSession = true ; // do not let processSLO to delete the entire session. Let userSession->logout do the job - $targetUrl = $auth->processSLO($keepLocalSession, null, false, null, $stay); - + $targetUrl = $auth->processSLO( + $this->SAMLSettings->usesSloWebServerDecode(), + null, + false, + null, + $stay + ); + $errors = $auth->getErrors(); if (!empty($errors)) { foreach($errors as $error) { diff --git a/lib/SAMLSettings.php b/lib/SAMLSettings.php index d25fa16a0..29a68395e 100644 --- a/lib/SAMLSettings.php +++ b/lib/SAMLSettings.php @@ -88,6 +88,10 @@ public function allowMultipleUserBackEnds() { return ($setting === '1' && $type === 'saml'); } + public function usesSloWebServerDecode() : bool { + return $this->config->getAppValue('user_saml', 'security-sloWebServerDecode', '0') === '1'; + } + /** * get config for given IDP * diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index 6c2f9efdf..aa405f726 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -90,7 +90,8 @@ public function getForm() { 'signatureAlgorithm' => [ 'type' => 'line', 'text' => $this->l10n->t('Algorithm that the toolkit will use on signing process.') - ] + ], + 'sloWebServerDecode' => $this->l10n->t('Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests.'), ]; $generalSettings = [ 'uid_mapping' => [ From 8142653173343f733719ceebce6601508f18ab3e Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Tue, 4 May 2021 17:36:32 +0200 Subject: [PATCH 24/38] Add new checkbox to AdminTest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukas Reschke Signed-off-by: Philipp Seßner --- tests/unit/Settings/AdminTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/unit/Settings/AdminTest.php b/tests/unit/Settings/AdminTest.php index 4d4353dbc..51df4b9c7 100644 --- a/tests/unit/Settings/AdminTest.php +++ b/tests/unit/Settings/AdminTest.php @@ -83,7 +83,8 @@ public function formDataProvider() { 'signatureAlgorithm' => [ 'type' => 'line', 'text' => 'Algorithm that the toolkit will use on signing process.' - ] + ], + 'sloWebServerDecode' => 'Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests.', ]; $generalSettings = [ 'idp0_display_name' => [ From f1eb5dd6f0a8d6c07e00021265db77eecf8c88aa Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 5 May 2021 13:25:54 +0200 Subject: [PATCH 25/38] Actually replace $retrieveParametersFromServer parameter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukas Reschke Signed-off-by: Philipp Seßner --- lib/Controller/SAMLController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Controller/SAMLController.php b/lib/Controller/SAMLController.php index dc8b5b801..02823acca 100644 --- a/lib/Controller/SAMLController.php +++ b/lib/Controller/SAMLController.php @@ -419,9 +419,9 @@ public function singleLogoutService() { if ($isFromIDP) { $keepLocalSession = true ; // do not let processSLO to delete the entire session. Let userSession->logout do the job $targetUrl = $auth->processSLO( - $this->SAMLSettings->usesSloWebServerDecode(), + $keepLocalSession, null, - false, + $this->SAMLSettings->usesSloWebServerDecode(), null, $stay ); From d0691812cd4d3f1d3712261a5de77974c4bc61fc Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Thu, 6 May 2021 03:29:49 +0000 Subject: [PATCH 26/38] [tx-robot] updated from transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nextcloud bot Signed-off-by: Philipp Seßner --- l10n/eu.js | 28 ++++++++++++++++++++++++++++ l10n/eu.json | 28 ++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/l10n/eu.js b/l10n/eu.js index 9b43ae2cd..c274f946d 100644 --- a/l10n/eu.js +++ b/l10n/eu.js @@ -12,10 +12,25 @@ OC.L10N.register( "X.509 certificate of the Service Provider" : "Zerbitzu-hornitzailearen X.509 ziurtagiria", "Private key of the Service Provider" : "Zerbitzu-hornitzaileraren gako pribatua", "Indicates that the nameID of the sent by this SP will be encrypted." : "SP honek bidalitako nameID enkriptatuta egongo dela adierazten du.", + "Indicates whether the messages sent by this SP will be signed. [Metadata of the SP will offer this info]" : "SP honek bidalitako mezuak sinatuko diren ala ez adierazten du. [SPren metadatuek informazio hau eskainiko dute]", "Indicates whether the messages sent by this SP will be signed." : "SP honek bidalitako mezuak sinatu behar diren ala ez adierazten du.", "Indicates whether the messages sent by this SP will be signed." : "SP honek bidalitako mezuak sinatu behar diren ala ez adierazten du.", "Whether the metadata should be signed." : "Metadatuek sinatuta egon behar duten ala ez.", + "Indicates a requirement for the , and elements received by this SP to be signed." : "SP-k jasotako ,eta elementuak sinatzeko baldintzak adierazten ditu.", + "Indicates a requirement for the elements received by this SP to be signed. [Metadata of the SP will offer this info]" : "SP-k jasotako elementuak sinatzeko baldintzak adierazten ditu. [SPren metadatuek informazio hau eskainiko dute]", + "Indicates a requirement for the elements received by this SP to be encrypted." : "SP honek jasotako elementuak enkriptatzeko baldintza adierazten du.", + " Indicates a requirement for the NameID element on the SAMLResponse received by this SP to be present." : "SP honek jasotako SAMLResponse-n NameID elementuak behar duen baldintza adierazten du.", + "Indicates a requirement for the NameID received by this SP to be encrypted." : "SP honek jasotako NameID enkriptatzeko baldintza adierazten du.", + "Indicates if the SP will validate all received XML." : "SPk jasotako XML guztia balioztatuko duen adierazten du.", + "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS URL-k SAML datuak minuskulaz kodetzen ditu eta lehenespenez tresna-multzoak maiuskula erabiltzen du. Gaitu ADFS bateragarritasuna sinadura egiaztatzerakoan.", + "Algorithm that the toolkit will use on signing process." : "Tresnak sinadura prozesuan erabiliko duen algoritmoa.", "Attribute to map the UID to." : "UIDa mapatzeko atributua.", + "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Baimendu autentifikazioa beste atzeko sistema batean kontu bat baldin badago. (adibidez, LDAP)", + "Attribute to map the displayname to." : "Atributua bistaratze-izena esleitzeko.", + "Attribute to map the email address to." : "Atributua helbide elektronikoa esleitzeko.", + "Attribute to map the quota to." : "Kuota esleitzeko atributua.", + "Attribute to map the users groups to." : "Atributua erabiltzaileen taldeak esleitzeko.", + "Attribute to map the users home to." : "Atributua erabiltzaileak etxera esleitzeko.", "Email address" : "Posta helbidea", "Encrypted" : "Zifratua", "Entity" : "Entitatea", @@ -25,9 +40,16 @@ OC.L10N.register( "Unspecified" : "Zehaztu gabea", "Windows domain qualified name" : "Windows domeinu izen kualifikatua", "X509 subject name" : "X509 gaia", + "Use SAML auth for the %s desktop clients (requires user re-authentication)" : "Erabili SAML autentifikazioa mahaigaineko %s bezeroentzat (erabiltzaileak berriro autentifikatzea eskatzen du)", + "Optional display name of the identity provider (default: \"SSO & SAML log in\")" : "Identitate hornitzailearen aukerako bistaratzeko izena (lehenetsia: \"SSO eta SAML saioa hasi\")", "Allow the use of multiple user back-ends (e.g. LDAP)" : "Baimendu erabiltzaile atzealde anitzen erabilpena (adib. LDAP)", "SSO & SAML authentication" : "SSO eta SAML autentifikazioa", + "Authenticate using single sign-on" : "Autentifikatu saio-hasiera bakarra erabiliz", + "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix." : "Zure Nextcloud-eko SSO & SAML aplikazioa erabiliz, lehendik duzun Saio-hasiera bakarreko irtenbidea Nextcloud-ekin integratzea erraztu dezakezu. Gainera, Nextcloud LDAP erabiltzaile hornitzailea erabili dezakezu erabiltzaileentzako erosotasuna mantentzeko. (adibidez, partekatzean)\nUne honetan honako hornitzaile hauek onartzen eta probatzen dira:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Inguruneko aldagaiaren bidez autentifikatzea**\n\t* Kerberos (mod_auth_kerb)\n\t* Inguruneko aldagaia erabiliz autentifikatzen duen beste edozein hornitzaile\n\nTeorikoki estandar horietako bat inplementatzen duen beste edozein autentifikazio hornitzaile bateragarria den arren, ohartarazi nahi dugu ez direla barneko test matrize baten parte.", "Open documentation" : "Ireki dokumentazioa", + "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you enabled \"%s\" or you go directly to the URL %s." : "Ziurtatu SSO bidez instantziara sar daitekeen administrari erabiltzaile bat konfiguratzen duzula. Ohiko %s kontuarekin saioa hastea ezinezkoa izango da, \"%s\" gaitu edo zuzenean %sURLera joaten ez bazara.", + "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you go directly to the URL %s." : "Ziurtatu SSO bidez instantziara sar daitekeen administrari erabiltzaile bat konfiguratzen duzula. Zure ohiko %s kontuarekin saioa hastea ezinezkoa izango da, zuzenean %sURLera joan ezean.", + "Please choose whether you want to authenticate using the SAML provider built-in in Nextcloud or whether you want to authenticate against an environment variable." : "Aukeratu ea Nextcloud-en integratutako SAML hornitzailea erabiliz autentifikatu nahi duzun edo ingurune aldagai baten aurka autentifikatu nahi duzun.", "Use built-in SAML authentication" : "Erabili integratutako SAML autentifikazioa", "Use environment variable" : "Erabili inguruneko aldagaia", "Global settings" : "Ezarpen orokorrak", @@ -35,13 +57,19 @@ OC.L10N.register( "Add identity provider" : "Gehitu identitate hornitzailea", "General" : "Orokorra", "Service Provider Data" : "Zerbitzu-hornitzailearen datuak", + "If your Service Provider should use certificates you can optionally specify them here." : "Zerbitzu hornitzaileak ziurtagiriak erabili behar baditu hemen zehaztu ditzakezu.", "Show Service Provider settings…" : "Erakutsi zerbitzu hornitzailearen ezarpenak...", "Name ID format" : "Izen ID formatua", "Identity Provider Data" : "Identitate-hornitzailearen datuak", "Configure your IdP settings here." : "Konfiguratu zure IdP ezarpenak hemen.", + "Identifier of the IdP entity (must be a URI)" : "IdP entitatearen identifikatzailea (URI bat izan behar du)", + "URL Target of the IdP where the SP will send the Authentication Request Message" : "IdPren URLaren helburua, SPk autentifikazio eskaera mezua bidaliko duenean", "Show optional Identity Provider settings…" : "Erakutsi identitate-hornitzailearen aukerako ezarpenak...", + "URL Location of the IdP where the SP will send the SLO Request" : "IDPren URL kokalekua, SPk SLO eskaera bidaliko duen tokira", + "URL Location of the IDP's SLO Response" : "IDPren SLO erantzunaren URL kokalekua", "Public X.509 certificate of the IdP" : "IdP-aren X.509 ziurtagiri publikoa", "Attribute mapping" : "Atributuen esleitzea", + "If you want to optionally map attributes to the user you can configure these here." : "Erabiltzaileari aukerako atributuak esleitu nahi badizkiozu, hemen konfiguratu ditzakezu.", "Show attribute mapping settings…" : "Erakutsi atributuen esleitze ezarpenak...", "Security settings" : "Segurtasun ezarpenak", "For increased security we recommend enabling the following settings if supported by your environment." : "Segurtasun gehiago izateko, gaitu honako ezarpenak, zure inguruneak onartzen baidtu.", diff --git a/l10n/eu.json b/l10n/eu.json index d2e82694f..891a117d2 100644 --- a/l10n/eu.json +++ b/l10n/eu.json @@ -10,10 +10,25 @@ "X.509 certificate of the Service Provider" : "Zerbitzu-hornitzailearen X.509 ziurtagiria", "Private key of the Service Provider" : "Zerbitzu-hornitzaileraren gako pribatua", "Indicates that the nameID of the sent by this SP will be encrypted." : "SP honek bidalitako nameID enkriptatuta egongo dela adierazten du.", + "Indicates whether the messages sent by this SP will be signed. [Metadata of the SP will offer this info]" : "SP honek bidalitako mezuak sinatuko diren ala ez adierazten du. [SPren metadatuek informazio hau eskainiko dute]", "Indicates whether the messages sent by this SP will be signed." : "SP honek bidalitako mezuak sinatu behar diren ala ez adierazten du.", "Indicates whether the messages sent by this SP will be signed." : "SP honek bidalitako mezuak sinatu behar diren ala ez adierazten du.", "Whether the metadata should be signed." : "Metadatuek sinatuta egon behar duten ala ez.", + "Indicates a requirement for the , and elements received by this SP to be signed." : "SP-k jasotako ,eta elementuak sinatzeko baldintzak adierazten ditu.", + "Indicates a requirement for the elements received by this SP to be signed. [Metadata of the SP will offer this info]" : "SP-k jasotako elementuak sinatzeko baldintzak adierazten ditu. [SPren metadatuek informazio hau eskainiko dute]", + "Indicates a requirement for the elements received by this SP to be encrypted." : "SP honek jasotako elementuak enkriptatzeko baldintza adierazten du.", + " Indicates a requirement for the NameID element on the SAMLResponse received by this SP to be present." : "SP honek jasotako SAMLResponse-n NameID elementuak behar duen baldintza adierazten du.", + "Indicates a requirement for the NameID received by this SP to be encrypted." : "SP honek jasotako NameID enkriptatzeko baldintza adierazten du.", + "Indicates if the SP will validate all received XML." : "SPk jasotako XML guztia balioztatuko duen adierazten du.", + "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS URL-k SAML datuak minuskulaz kodetzen ditu eta lehenespenez tresna-multzoak maiuskula erabiltzen du. Gaitu ADFS bateragarritasuna sinadura egiaztatzerakoan.", + "Algorithm that the toolkit will use on signing process." : "Tresnak sinadura prozesuan erabiliko duen algoritmoa.", "Attribute to map the UID to." : "UIDa mapatzeko atributua.", + "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Baimendu autentifikazioa beste atzeko sistema batean kontu bat baldin badago. (adibidez, LDAP)", + "Attribute to map the displayname to." : "Atributua bistaratze-izena esleitzeko.", + "Attribute to map the email address to." : "Atributua helbide elektronikoa esleitzeko.", + "Attribute to map the quota to." : "Kuota esleitzeko atributua.", + "Attribute to map the users groups to." : "Atributua erabiltzaileen taldeak esleitzeko.", + "Attribute to map the users home to." : "Atributua erabiltzaileak etxera esleitzeko.", "Email address" : "Posta helbidea", "Encrypted" : "Zifratua", "Entity" : "Entitatea", @@ -23,9 +38,16 @@ "Unspecified" : "Zehaztu gabea", "Windows domain qualified name" : "Windows domeinu izen kualifikatua", "X509 subject name" : "X509 gaia", + "Use SAML auth for the %s desktop clients (requires user re-authentication)" : "Erabili SAML autentifikazioa mahaigaineko %s bezeroentzat (erabiltzaileak berriro autentifikatzea eskatzen du)", + "Optional display name of the identity provider (default: \"SSO & SAML log in\")" : "Identitate hornitzailearen aukerako bistaratzeko izena (lehenetsia: \"SSO eta SAML saioa hasi\")", "Allow the use of multiple user back-ends (e.g. LDAP)" : "Baimendu erabiltzaile atzealde anitzen erabilpena (adib. LDAP)", "SSO & SAML authentication" : "SSO eta SAML autentifikazioa", + "Authenticate using single sign-on" : "Autentifikatu saio-hasiera bakarra erabiliz", + "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix." : "Zure Nextcloud-eko SSO & SAML aplikazioa erabiliz, lehendik duzun Saio-hasiera bakarreko irtenbidea Nextcloud-ekin integratzea erraztu dezakezu. Gainera, Nextcloud LDAP erabiltzaile hornitzailea erabili dezakezu erabiltzaileentzako erosotasuna mantentzeko. (adibidez, partekatzean)\nUne honetan honako hornitzaile hauek onartzen eta probatzen dira:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Inguruneko aldagaiaren bidez autentifikatzea**\n\t* Kerberos (mod_auth_kerb)\n\t* Inguruneko aldagaia erabiliz autentifikatzen duen beste edozein hornitzaile\n\nTeorikoki estandar horietako bat inplementatzen duen beste edozein autentifikazio hornitzaile bateragarria den arren, ohartarazi nahi dugu ez direla barneko test matrize baten parte.", "Open documentation" : "Ireki dokumentazioa", + "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you enabled \"%s\" or you go directly to the URL %s." : "Ziurtatu SSO bidez instantziara sar daitekeen administrari erabiltzaile bat konfiguratzen duzula. Ohiko %s kontuarekin saioa hastea ezinezkoa izango da, \"%s\" gaitu edo zuzenean %sURLera joaten ez bazara.", + "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you go directly to the URL %s." : "Ziurtatu SSO bidez instantziara sar daitekeen administrari erabiltzaile bat konfiguratzen duzula. Zure ohiko %s kontuarekin saioa hastea ezinezkoa izango da, zuzenean %sURLera joan ezean.", + "Please choose whether you want to authenticate using the SAML provider built-in in Nextcloud or whether you want to authenticate against an environment variable." : "Aukeratu ea Nextcloud-en integratutako SAML hornitzailea erabiliz autentifikatu nahi duzun edo ingurune aldagai baten aurka autentifikatu nahi duzun.", "Use built-in SAML authentication" : "Erabili integratutako SAML autentifikazioa", "Use environment variable" : "Erabili inguruneko aldagaia", "Global settings" : "Ezarpen orokorrak", @@ -33,13 +55,19 @@ "Add identity provider" : "Gehitu identitate hornitzailea", "General" : "Orokorra", "Service Provider Data" : "Zerbitzu-hornitzailearen datuak", + "If your Service Provider should use certificates you can optionally specify them here." : "Zerbitzu hornitzaileak ziurtagiriak erabili behar baditu hemen zehaztu ditzakezu.", "Show Service Provider settings…" : "Erakutsi zerbitzu hornitzailearen ezarpenak...", "Name ID format" : "Izen ID formatua", "Identity Provider Data" : "Identitate-hornitzailearen datuak", "Configure your IdP settings here." : "Konfiguratu zure IdP ezarpenak hemen.", + "Identifier of the IdP entity (must be a URI)" : "IdP entitatearen identifikatzailea (URI bat izan behar du)", + "URL Target of the IdP where the SP will send the Authentication Request Message" : "IdPren URLaren helburua, SPk autentifikazio eskaera mezua bidaliko duenean", "Show optional Identity Provider settings…" : "Erakutsi identitate-hornitzailearen aukerako ezarpenak...", + "URL Location of the IdP where the SP will send the SLO Request" : "IDPren URL kokalekua, SPk SLO eskaera bidaliko duen tokira", + "URL Location of the IDP's SLO Response" : "IDPren SLO erantzunaren URL kokalekua", "Public X.509 certificate of the IdP" : "IdP-aren X.509 ziurtagiri publikoa", "Attribute mapping" : "Atributuen esleitzea", + "If you want to optionally map attributes to the user you can configure these here." : "Erabiltzaileari aukerako atributuak esleitu nahi badizkiozu, hemen konfiguratu ditzakezu.", "Show attribute mapping settings…" : "Erakutsi atributuen esleitze ezarpenak...", "Security settings" : "Segurtasun ezarpenak", "For increased security we recommend enabling the following settings if supported by your environment." : "Segurtasun gehiago izateko, gaitu honako ezarpenak, zure inguruneak onartzen baidtu.", From 6d96acbe209417a87d54151c916a4bce89af44ad Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 7 May 2021 03:29:22 +0000 Subject: [PATCH 27/38] [tx-robot] updated from transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nextcloud bot Signed-off-by: Philipp Seßner --- l10n/de_DE.js | 1 + l10n/de_DE.json | 1 + l10n/nl.js | 1 + l10n/nl.json | 1 + l10n/pl.js | 1 + l10n/pl.json | 1 + l10n/tr.js | 1 + l10n/tr.json | 1 + l10n/zh_CN.js | 1 + l10n/zh_CN.json | 1 + l10n/zh_HK.js | 1 + l10n/zh_HK.json | 1 + 12 files changed, 12 insertions(+) diff --git a/l10n/de_DE.js b/l10n/de_DE.js index 1a2509630..0e77fa17e 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -24,6 +24,7 @@ OC.L10N.register( "Indicates if the SP will validate all received XML." : "Gibt an, ob der Diensteanbieter alle empfangenen XML-Inhalte überprüft.", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS kodiert SAML-URL-Daten in Kleinbuchstaben und das Toolkit nutzt als Standard Großbuchstaben. Diese Option für ADFS-Kompatibilität bei Signatur-Überprüfung aktivieren.", "Algorithm that the toolkit will use on signing process." : "Algorithmus, den das Toolkit beim Signieren verwendet.", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "Abfrageparameter von $_SERVER abrufen. Einige SAML-Server erfordern dies bei SLO-Anfragen.", "Attribute to map the UID to." : "Attribut dem die UID zugeordnet werden soll.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Anmeldung nur erlauben, wenn ein Konto auf einem anderen Backend vorhanden ist (z.B. LDAP)", "Attribute to map the displayname to." : "Attribut dem der Anzeigename zugeordnet werden soll.", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index df6de978c..fa6edabc1 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -22,6 +22,7 @@ "Indicates if the SP will validate all received XML." : "Gibt an, ob der Diensteanbieter alle empfangenen XML-Inhalte überprüft.", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS kodiert SAML-URL-Daten in Kleinbuchstaben und das Toolkit nutzt als Standard Großbuchstaben. Diese Option für ADFS-Kompatibilität bei Signatur-Überprüfung aktivieren.", "Algorithm that the toolkit will use on signing process." : "Algorithmus, den das Toolkit beim Signieren verwendet.", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "Abfrageparameter von $_SERVER abrufen. Einige SAML-Server erfordern dies bei SLO-Anfragen.", "Attribute to map the UID to." : "Attribut dem die UID zugeordnet werden soll.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Anmeldung nur erlauben, wenn ein Konto auf einem anderen Backend vorhanden ist (z.B. LDAP)", "Attribute to map the displayname to." : "Attribut dem der Anzeigename zugeordnet werden soll.", diff --git a/l10n/nl.js b/l10n/nl.js index 1c15005e9..3917f9ad6 100644 --- a/l10n/nl.js +++ b/l10n/nl.js @@ -24,6 +24,7 @@ OC.L10N.register( "Indicates if the SP will validate all received XML." : "Geeft aan of de SP alle ontvangen XMLs zal valideren.", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS URL - codeert SAML gegevens als kleine letters en de toolkit gebruikt standaard hoofdletters. Inschakelen voor ADFS compatibiliteit voor handtekeningverificatie.", "Algorithm that the toolkit will use on signing process." : "Algoritme dat de toolkit zal gebruiken bij het ondertekeningsproces.", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "Haal queryparameters op van $ _SERVER. Sommige SAML-servers vereisen dit bij SLO-verzoeken.", "Attribute to map the UID to." : "Attribuut om de UID op te mappen.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Sta alleen authenticatie toe als een account bestaat op een ander backend (bijv. LDAP).", "Attribute to map the displayname to." : "weergavenaam toekennen om in kaart te brengen", diff --git a/l10n/nl.json b/l10n/nl.json index 98daf52c1..e072113e7 100644 --- a/l10n/nl.json +++ b/l10n/nl.json @@ -22,6 +22,7 @@ "Indicates if the SP will validate all received XML." : "Geeft aan of de SP alle ontvangen XMLs zal valideren.", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS URL - codeert SAML gegevens als kleine letters en de toolkit gebruikt standaard hoofdletters. Inschakelen voor ADFS compatibiliteit voor handtekeningverificatie.", "Algorithm that the toolkit will use on signing process." : "Algoritme dat de toolkit zal gebruiken bij het ondertekeningsproces.", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "Haal queryparameters op van $ _SERVER. Sommige SAML-servers vereisen dit bij SLO-verzoeken.", "Attribute to map the UID to." : "Attribuut om de UID op te mappen.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Sta alleen authenticatie toe als een account bestaat op een ander backend (bijv. LDAP).", "Attribute to map the displayname to." : "weergavenaam toekennen om in kaart te brengen", diff --git a/l10n/pl.js b/l10n/pl.js index dd71c8a9f..e812a8dee 100644 --- a/l10n/pl.js +++ b/l10n/pl.js @@ -24,6 +24,7 @@ OC.L10N.register( "Indicates if the SP will validate all received XML." : "Wskazuje, czy dostawca usług zatwierdzi wszystkie odebrane XML.", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "Dane ADFS URL-Encodes SAML są małymi literami a narzędzie standardowo obsługuje duże litery. Włącz dla ADFS kompatybilność weryfikacji podpisu.", "Algorithm that the toolkit will use on signing process." : "Algorytm, który zostanie użyty podczas procesu podpisywania.", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "Pobierz parametry zapytania z $_SERVER. Niektóre serwery SAML wymagają tego w żądaniach SLO.", "Attribute to map the UID to." : "Atrybut do mapowania UID.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Zezwalaj na uwierzytelnienie tylko wtedy, jeśli konto istnieje na jakiejś innej platformie (np. LDAP)", "Attribute to map the displayname to." : "Atrybut do mapowania wyświetlanej nazwy użytkownika.", diff --git a/l10n/pl.json b/l10n/pl.json index e51d00ce2..1f384c42a 100644 --- a/l10n/pl.json +++ b/l10n/pl.json @@ -22,6 +22,7 @@ "Indicates if the SP will validate all received XML." : "Wskazuje, czy dostawca usług zatwierdzi wszystkie odebrane XML.", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "Dane ADFS URL-Encodes SAML są małymi literami a narzędzie standardowo obsługuje duże litery. Włącz dla ADFS kompatybilność weryfikacji podpisu.", "Algorithm that the toolkit will use on signing process." : "Algorytm, który zostanie użyty podczas procesu podpisywania.", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "Pobierz parametry zapytania z $_SERVER. Niektóre serwery SAML wymagają tego w żądaniach SLO.", "Attribute to map the UID to." : "Atrybut do mapowania UID.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Zezwalaj na uwierzytelnienie tylko wtedy, jeśli konto istnieje na jakiejś innej platformie (np. LDAP)", "Attribute to map the displayname to." : "Atrybut do mapowania wyświetlanej nazwy użytkownika.", diff --git a/l10n/tr.js b/l10n/tr.js index bfba999e8..526f88ced 100644 --- a/l10n/tr.js +++ b/l10n/tr.js @@ -24,6 +24,7 @@ OC.L10N.register( "Indicates if the SP will validate all received XML." : "Hizmet sağlayıcının alınan tüm XML kodlarını doğrulayacağını gösterir.", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS SAML verilerindeki adres kodlamalarını küçük harfler ile yaparken araç büyük harf kullanır. İmza doğrulaması bölümündeki ADFS uyumluluğunu etkinleştirin.", "Algorithm that the toolkit will use on signing process." : "İmzalama işleminde araç takımı tarafından kullanılacak algoritma.", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "Sorgu parametreleri $_SERVER üzerinden alınsın. Bazı SAML sunucuları Tek oturum kapatma istekleri için buna gerek duyar.", "Attribute to map the UID to." : "UID değerinin eşleştirileceği öznitelik.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Kimlik yalnız, hesap başka bir arka sistemde varsa (LDAP gibi) doğrulansın", "Attribute to map the displayname to." : "Görüntülenecek ad değerinin eşleştirileceği öznitelik.", diff --git a/l10n/tr.json b/l10n/tr.json index bc06f8072..1f990d347 100644 --- a/l10n/tr.json +++ b/l10n/tr.json @@ -22,6 +22,7 @@ "Indicates if the SP will validate all received XML." : "Hizmet sağlayıcının alınan tüm XML kodlarını doğrulayacağını gösterir.", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS SAML verilerindeki adres kodlamalarını küçük harfler ile yaparken araç büyük harf kullanır. İmza doğrulaması bölümündeki ADFS uyumluluğunu etkinleştirin.", "Algorithm that the toolkit will use on signing process." : "İmzalama işleminde araç takımı tarafından kullanılacak algoritma.", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "Sorgu parametreleri $_SERVER üzerinden alınsın. Bazı SAML sunucuları Tek oturum kapatma istekleri için buna gerek duyar.", "Attribute to map the UID to." : "UID değerinin eşleştirileceği öznitelik.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Kimlik yalnız, hesap başka bir arka sistemde varsa (LDAP gibi) doğrulansın", "Attribute to map the displayname to." : "Görüntülenecek ad değerinin eşleştirileceği öznitelik.", diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js index 12f716d63..8aad02c9c 100644 --- a/l10n/zh_CN.js +++ b/l10n/zh_CN.js @@ -24,6 +24,7 @@ OC.L10N.register( "Indicates if the SP will validate all received XML." : "指定 SP 是否验证所有接收到的 XML。", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS URL - 将 SAML 数据编码为小写，默认情况下，该工具包使用大写。 在签名验证时启用 ADFS 兼容性。", "Algorithm that the toolkit will use on signing process." : "该工具包将在签名过程中使用的算法。", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "从 $_SERVER 检索查询参数。一些 SAML 服务器的 SLO 请求需要这个。", "Attribute to map the UID to." : "映射到 UID 的属性。", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "仅在其他后端存在账号时才允许身份验证。 （例如 LDAP）", "Attribute to map the displayname to." : "映射到显示名称的属性。", diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json index c830e5064..09522dcde 100644 --- a/l10n/zh_CN.json +++ b/l10n/zh_CN.json @@ -22,6 +22,7 @@ "Indicates if the SP will validate all received XML." : "指定 SP 是否验证所有接收到的 XML。", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS URL - 将 SAML 数据编码为小写，默认情况下，该工具包使用大写。 在签名验证时启用 ADFS 兼容性。", "Algorithm that the toolkit will use on signing process." : "该工具包将在签名过程中使用的算法。", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "从 $_SERVER 检索查询参数。一些 SAML 服务器的 SLO 请求需要这个。", "Attribute to map the UID to." : "映射到 UID 的属性。", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "仅在其他后端存在账号时才允许身份验证。 （例如 LDAP）", "Attribute to map the displayname to." : "映射到显示名称的属性。", diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js index 0b44efcfb..ba01f9194 100644 --- a/l10n/zh_HK.js +++ b/l10n/zh_HK.js @@ -24,6 +24,7 @@ OC.L10N.register( "Indicates if the SP will validate all received XML." : "指定 SP 是否驗證所有接收到的 XML。", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS URL - 將 SAML 數據編碼為小寫，默認情況下，該工具包使用大寫。 在簽名驗證時啟用 ADFS 兼容性。", "Algorithm that the toolkit will use on signing process." : "該工具包將在簽名過程中使用的算法。", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "從$ _SERVER檢索查詢參數。 某些SAML伺服器在SLO請求上要求這樣做。", "Attribute to map the UID to." : "映射到 UID 的屬性。", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "僅在其他後端存在賬號時才允許身分驗證。 （例如 LDAP）", "Attribute to map the displayname to." : "映射到顯示名稱的屬性。", diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json index 730b7ce6f..a292144fa 100644 --- a/l10n/zh_HK.json +++ b/l10n/zh_HK.json @@ -22,6 +22,7 @@ "Indicates if the SP will validate all received XML." : "指定 SP 是否驗證所有接收到的 XML。", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS URL - 將 SAML 數據編碼為小寫，默認情況下，該工具包使用大寫。 在簽名驗證時啟用 ADFS 兼容性。", "Algorithm that the toolkit will use on signing process." : "該工具包將在簽名過程中使用的算法。", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "從$ _SERVER檢索查詢參數。 某些SAML伺服器在SLO請求上要求這樣做。", "Attribute to map the UID to." : "映射到 UID 的屬性。", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "僅在其他後端存在賬號時才允許身分驗證。 （例如 LDAP）", "Attribute to map the displayname to." : "映射到顯示名稱的屬性。", From d2ba906ba3403791e262c517e4aa6e6ba05a6448 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sat, 8 May 2021 03:27:00 +0000 Subject: [PATCH 28/38] [tx-robot] updated from transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nextcloud bot Signed-off-by: Philipp Seßner --- l10n/es.js | 1 + l10n/es.json | 1 + l10n/eu.js | 1 + l10n/eu.json | 1 + l10n/pt_BR.js | 1 + l10n/pt_BR.json | 1 + 6 files changed, 6 insertions(+) diff --git a/l10n/es.js b/l10n/es.js index be17f69e8..88bbdd027 100644 --- a/l10n/es.js +++ b/l10n/es.js @@ -24,6 +24,7 @@ OC.L10N.register( "Indicates if the SP will validate all received XML." : "Indica si el SP validará todo el XML recibido.", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS URL-Cifra datos SAML en minúsculas, y el kit de herramientas usa mayúsculas por omisión. Active ADFS para compatibilidad en la firma de verificación.", "Algorithm that the toolkit will use on signing process." : "El algoritmo que la herramienta usará en el proceso de firma.", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "Recupera los parámetros de consulta de $_SERVER. Algunos servidores SAML requieren esto en las solicitudes SLO.", "Attribute to map the UID to." : "Atributo para definir la UID.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Permitir la autenticación solo si una cuenta existe en algún otro motor (LDAP, p. ej.).", "Attribute to map the displayname to." : "Atributo para definir el nombre mostrado", diff --git a/l10n/es.json b/l10n/es.json index 7377f8eee..897001311 100644 --- a/l10n/es.json +++ b/l10n/es.json @@ -22,6 +22,7 @@ "Indicates if the SP will validate all received XML." : "Indica si el SP validará todo el XML recibido.", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS URL-Cifra datos SAML en minúsculas, y el kit de herramientas usa mayúsculas por omisión. Active ADFS para compatibilidad en la firma de verificación.", "Algorithm that the toolkit will use on signing process." : "El algoritmo que la herramienta usará en el proceso de firma.", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "Recupera los parámetros de consulta de $_SERVER. Algunos servidores SAML requieren esto en las solicitudes SLO.", "Attribute to map the UID to." : "Atributo para definir la UID.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Permitir la autenticación solo si una cuenta existe en algún otro motor (LDAP, p. ej.).", "Attribute to map the displayname to." : "Atributo para definir el nombre mostrado", diff --git a/l10n/eu.js b/l10n/eu.js index c274f946d..ac3fa2790 100644 --- a/l10n/eu.js +++ b/l10n/eu.js @@ -24,6 +24,7 @@ OC.L10N.register( "Indicates if the SP will validate all received XML." : "SPk jasotako XML guztia balioztatuko duen adierazten du.", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS URL-k SAML datuak minuskulaz kodetzen ditu eta lehenespenez tresna-multzoak maiuskula erabiltzen du. Gaitu ADFS bateragarritasuna sinadura egiaztatzerakoan.", "Algorithm that the toolkit will use on signing process." : "Tresnak sinadura prozesuan erabiliko duen algoritmoa.", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "Berreskuratu kontsultaren parametroak $ _SERVER-etik. SAML zerbitzari batzuek hori eskatzen dute SLO eskaeretan.", "Attribute to map the UID to." : "UIDa mapatzeko atributua.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Baimendu autentifikazioa beste atzeko sistema batean kontu bat baldin badago. (adibidez, LDAP)", "Attribute to map the displayname to." : "Atributua bistaratze-izena esleitzeko.", diff --git a/l10n/eu.json b/l10n/eu.json index 891a117d2..0d5fb7e84 100644 --- a/l10n/eu.json +++ b/l10n/eu.json @@ -22,6 +22,7 @@ "Indicates if the SP will validate all received XML." : "SPk jasotako XML guztia balioztatuko duen adierazten du.", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS URL-k SAML datuak minuskulaz kodetzen ditu eta lehenespenez tresna-multzoak maiuskula erabiltzen du. Gaitu ADFS bateragarritasuna sinadura egiaztatzerakoan.", "Algorithm that the toolkit will use on signing process." : "Tresnak sinadura prozesuan erabiliko duen algoritmoa.", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "Berreskuratu kontsultaren parametroak $ _SERVER-etik. SAML zerbitzari batzuek hori eskatzen dute SLO eskaeretan.", "Attribute to map the UID to." : "UIDa mapatzeko atributua.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Baimendu autentifikazioa beste atzeko sistema batean kontu bat baldin badago. (adibidez, LDAP)", "Attribute to map the displayname to." : "Atributua bistaratze-izena esleitzeko.", diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js index b0b7e9853..6e98e3160 100644 --- a/l10n/pt_BR.js +++ b/l10n/pt_BR.js @@ -24,6 +24,7 @@ OC.L10N.register( "Indicates if the SP will validate all received XML." : "Indica se o SP validará todos os XML recebidos.", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS URL - codifica os dados do SAML como minúsculas, e o kit de ferramentas por padrão usa letras maiúsculas. Habilite para compatibilidade do ADFS na verificação de assinaturas.", "Algorithm that the toolkit will use on signing process." : "Algoritmo que o kit de ferramentas usará no processo de assinatura.", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "Recuperar parâmetros de consulta de $_SERVER. Alguns servidores SAML exigem isso em solicitações SLO.", "Attribute to map the UID to." : "Atributo para mapear o UID.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Apenas permitir a autenticação se uma conta existir em algum outro backend. (Por ex. LDAP)", "Attribute to map the displayname to." : "Atributo para mapear o nome de exibição.", diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json index 37d3ae0f8..d16810b8e 100644 --- a/l10n/pt_BR.json +++ b/l10n/pt_BR.json @@ -22,6 +22,7 @@ "Indicates if the SP will validate all received XML." : "Indica se o SP validará todos os XML recebidos.", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS URL - codifica os dados do SAML como minúsculas, e o kit de ferramentas por padrão usa letras maiúsculas. Habilite para compatibilidade do ADFS na verificação de assinaturas.", "Algorithm that the toolkit will use on signing process." : "Algoritmo que o kit de ferramentas usará no processo de assinatura.", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "Recuperar parâmetros de consulta de $_SERVER. Alguns servidores SAML exigem isso em solicitações SLO.", "Attribute to map the UID to." : "Atributo para mapear o UID.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Apenas permitir a autenticação se uma conta existir em algum outro backend. (Por ex. LDAP)", "Attribute to map the displayname to." : "Atributo para mapear o nome de exibição.", From c32ca47b88ddea8c2d845d5cab1d1aa0fbcc9de3 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Mon, 10 May 2021 03:36:13 +0000 Subject: [PATCH 29/38] [tx-robot] updated from transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nextcloud bot Signed-off-by: Philipp Seßner --- l10n/de_DE.js | 2 +- l10n/de_DE.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/l10n/de_DE.js b/l10n/de_DE.js index 0e77fa17e..43f4261c8 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -50,7 +50,7 @@ OC.L10N.register( "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix." : "Die SSO & SAML-App ermöglicht es Ihre bereits bestehende Singl-Sign-On-Lösung einfach in Nextcloud zu integrieren. Ausserdem kann der Nextcloud LDAP-Nutzer-Anbieter verwendet werden, um es den Nutzern (z.B. beim eilen) besonders einfach zu machen.\nBislang werden folgende Anbieter unterstützt und sind getestet:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Anmeldung über Umgebungsvariable**\n\t* Kerberos (mod_auth_kerb)\n\t* Alle anderen Anbieter, die die Umgebungsvariable verwenden\n\nObwohl theoretisch jeder andere Anmeldungs-Anbieter der einen der Standards implementiert hat verwendet werden kann, weisen wir darauf hin, dass diese anderen Anbieter nicht in unserer Test-Matrix berücksichtigt werden.", "Open documentation" : "Dokumentation öffnen", "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you enabled \"%s\" or you go directly to the URL %s." : "Es muss ein Benutzer mit Administrator-Rechten vorhanden sein, der sich mittels SSO anmelden kann. Eine Anmeldung mit Ihrem normalen Zugang %s ist dann nicht mehr möglich, außer Sie haben \"%s\" aktiviert oder Sie gehen direkt zur URL %s.", - "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you go directly to the URL %s." : "Es muss ein Benutzer mit Administrator-Rechten vorhanden sein, der sich mittels SSO anmelden kann. Eine Anmeldung mit ihrem normalen Konto %s wird nicht mehr möglich, es sei denn, Sie gehen direkt zur URL %s.", + "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you go directly to the URL %s." : "Es muss ein Benutzer mit Administrator-Rechten vorhanden sein, der sich mittels SSO anmelden kann. Eine Anmeldung mit ihrem normalen Konto %s wird nicht mehr möglich sein, es sei denn, Sie gehen direkt zur URL %s.", "Please choose whether you want to authenticate using the SAML provider built-in in Nextcloud or whether you want to authenticate against an environment variable." : "Bitte auswählen ob die Authentifizierung mittels in Nextcloud integriertem SAML-Provider oder gegen eine Umgebungsvariable erfolgen soll.", "Use built-in SAML authentication" : "Integrierte SAML-Authentifizierung benutzen", "Use environment variable" : "Umgebungsvariable benutzen", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index fa6edabc1..c6d9e283b 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -48,7 +48,7 @@ "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix." : "Die SSO & SAML-App ermöglicht es Ihre bereits bestehende Singl-Sign-On-Lösung einfach in Nextcloud zu integrieren. Ausserdem kann der Nextcloud LDAP-Nutzer-Anbieter verwendet werden, um es den Nutzern (z.B. beim eilen) besonders einfach zu machen.\nBislang werden folgende Anbieter unterstützt und sind getestet:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Anmeldung über Umgebungsvariable**\n\t* Kerberos (mod_auth_kerb)\n\t* Alle anderen Anbieter, die die Umgebungsvariable verwenden\n\nObwohl theoretisch jeder andere Anmeldungs-Anbieter der einen der Standards implementiert hat verwendet werden kann, weisen wir darauf hin, dass diese anderen Anbieter nicht in unserer Test-Matrix berücksichtigt werden.", "Open documentation" : "Dokumentation öffnen", "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you enabled \"%s\" or you go directly to the URL %s." : "Es muss ein Benutzer mit Administrator-Rechten vorhanden sein, der sich mittels SSO anmelden kann. Eine Anmeldung mit Ihrem normalen Zugang %s ist dann nicht mehr möglich, außer Sie haben \"%s\" aktiviert oder Sie gehen direkt zur URL %s.", - "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you go directly to the URL %s." : "Es muss ein Benutzer mit Administrator-Rechten vorhanden sein, der sich mittels SSO anmelden kann. Eine Anmeldung mit ihrem normalen Konto %s wird nicht mehr möglich, es sei denn, Sie gehen direkt zur URL %s.", + "Make sure to configure an administrative user that can access the instance via SSO. Logging-in with your regular %s account won't be possible anymore, unless you go directly to the URL %s." : "Es muss ein Benutzer mit Administrator-Rechten vorhanden sein, der sich mittels SSO anmelden kann. Eine Anmeldung mit ihrem normalen Konto %s wird nicht mehr möglich sein, es sei denn, Sie gehen direkt zur URL %s.", "Please choose whether you want to authenticate using the SAML provider built-in in Nextcloud or whether you want to authenticate against an environment variable." : "Bitte auswählen ob die Authentifizierung mittels in Nextcloud integriertem SAML-Provider oder gegen eine Umgebungsvariable erfolgen soll.", "Use built-in SAML authentication" : "Integrierte SAML-Authentifizierung benutzen", "Use environment variable" : "Umgebungsvariable benutzen", From 6253cfcaf77df08486fa088560d1365863259d60 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Tue, 11 May 2021 03:26:30 +0000 Subject: [PATCH 30/38] [tx-robot] updated from transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nextcloud bot Signed-off-by: Philipp Seßner --- l10n/cs.js | 1 + l10n/cs.json | 1 + 2 files changed, 2 insertions(+) diff --git a/l10n/cs.js b/l10n/cs.js index 111b24bce..47051fff8 100644 --- a/l10n/cs.js +++ b/l10n/cs.js @@ -24,6 +24,7 @@ OC.L10N.register( "Indicates if the SP will validate all received XML." : "Indikuje, zda poskytovatel služeb ověří všechna přijatá XML.", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS URL kóduje SAML data malými písmeny, a toolkit používá ve výchozím nastavení velká písmena. Povolit pro ADFS kompatibilitu pro ověření podpisu.", "Algorithm that the toolkit will use on signing process." : "Algoritmus který sada nástrojů použije při procesu podepisování.", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "Získat parametry dotazu ze $_SERVER. Některé SAML servery toto vyžadují v případě SLO požadavků.", "Attribute to map the UID to." : "Atribut k přiřazení UID.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Přihlášení povolit pouze pokud účet už existuje i někde jinde. (např. LDAP)", "Attribute to map the displayname to." : "Atribut, na který se má mapovat zobrazované jméno.", diff --git a/l10n/cs.json b/l10n/cs.json index bf95d1d9b..aad689c43 100644 --- a/l10n/cs.json +++ b/l10n/cs.json @@ -22,6 +22,7 @@ "Indicates if the SP will validate all received XML." : "Indikuje, zda poskytovatel služeb ověří všechna přijatá XML.", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS URL kóduje SAML data malými písmeny, a toolkit používá ve výchozím nastavení velká písmena. Povolit pro ADFS kompatibilitu pro ověření podpisu.", "Algorithm that the toolkit will use on signing process." : "Algoritmus který sada nástrojů použije při procesu podepisování.", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "Získat parametry dotazu ze $_SERVER. Některé SAML servery toto vyžadují v případě SLO požadavků.", "Attribute to map the UID to." : "Atribut k přiřazení UID.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Přihlášení povolit pouze pokud účet už existuje i někde jinde. (např. LDAP)", "Attribute to map the displayname to." : "Atribut, na který se má mapovat zobrazované jméno.", From c9592396c9a4292f2ebe23da884c18c20b3f2a50 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sun, 16 May 2021 03:32:22 +0000 Subject: [PATCH 31/38] [tx-robot] updated from transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nextcloud bot Signed-off-by: Philipp Seßner --- l10n/de.js | 3 ++- l10n/de.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/l10n/de.js b/l10n/de.js index 6e255aba4..623573ecf 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -24,6 +24,7 @@ OC.L10N.register( "Indicates if the SP will validate all received XML." : "Zeigt an, ob der Diensteanbieter alles empfangene XML überprüft. ", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS kodiert SAML-URL-Daten in Kleinbuchstaben und das Toolkit nutzt als Standard Großbuchstaben. Diese Option für ADFS-Kompatibilität bei Signatur-Überprüfung aktivieren.", "Algorithm that the toolkit will use on signing process." : "Algorithmus, den das Toolkit beim Signieren verwendet.", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "Abfrageparameter von $_SERVER abrufen. Einige SAML-Server erfordern dies bei SLO-Anfragen.", "Attribute to map the UID to." : "Attribut dem die UID zugeordnet werden soll.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Anmeldung nur erlauben, wenn ein Konto auf einem anderen Backend vorhanden ist (z.B. LDAP)", "Attribute to map the displayname to." : "Attribut dem der Anzeigename zugeordnet werden soll.", @@ -58,7 +59,7 @@ OC.L10N.register( "Add identity provider" : "Autorisierungsdienst hinzufügen", "General" : "Allgemein", "Service Provider Data" : "Diensteanbieter-Daten", - "If your Service Provider should use certificates you can optionally specify them here." : "Sollte dein Diensteanbieter Zertifikate benutzen, dann hast du hier die Möglichkeit diese anzugeben.", + "If your Service Provider should use certificates you can optionally specify them here." : "Sollte Dein Diensteanbieter Zertifikate benutzen, dann hast Du hier die Möglichkeit, diese anzugeben.", "Show Service Provider settings…" : "Zeige die Diensteanbieter-Einstellungen…", "Name ID format" : "Name-ID-Format", "Identity Provider Data" : "Daten des Autorisierungsdienstes", diff --git a/l10n/de.json b/l10n/de.json index d25c80f9e..edf66d49c 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -22,6 +22,7 @@ "Indicates if the SP will validate all received XML." : "Zeigt an, ob der Diensteanbieter alles empfangene XML überprüft. ", "ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification." : "ADFS kodiert SAML-URL-Daten in Kleinbuchstaben und das Toolkit nutzt als Standard Großbuchstaben. Diese Option für ADFS-Kompatibilität bei Signatur-Überprüfung aktivieren.", "Algorithm that the toolkit will use on signing process." : "Algorithmus, den das Toolkit beim Signieren verwendet.", + "Retrieve query parameters from $_SERVER. Some SAML servers require this on SLO requests." : "Abfrageparameter von $_SERVER abrufen. Einige SAML-Server erfordern dies bei SLO-Anfragen.", "Attribute to map the UID to." : "Attribut dem die UID zugeordnet werden soll.", "Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Anmeldung nur erlauben, wenn ein Konto auf einem anderen Backend vorhanden ist (z.B. LDAP)", "Attribute to map the displayname to." : "Attribut dem der Anzeigename zugeordnet werden soll.", @@ -55,7 +56,7 @@ "Add identity provider" : "Autorisierungsdienst hinzufügen", "General" : "Allgemein", "Service Provider Data" : "Diensteanbieter-Daten", - "If your Service Provider should use certificates you can optionally specify them here." : "Sollte dein Diensteanbieter Zertifikate benutzen, dann hast du hier die Möglichkeit diese anzugeben.", + "If your Service Provider should use certificates you can optionally specify them here." : "Sollte Dein Diensteanbieter Zertifikate benutzen, dann hast Du hier die Möglichkeit, diese anzugeben.", "Show Service Provider settings…" : "Zeige die Diensteanbieter-Einstellungen…", "Name ID format" : "Name-ID-Format", "Identity Provider Data" : "Daten des Autorisierungsdienstes", From 8caf2d3530e8199bc65b2916270dbe2241e4d433 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Mon, 17 May 2021 13:45:10 +0200 Subject: [PATCH 32/38] Bump version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roeland Jago Douma Signed-off-by: Philipp Seßner --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 2b3d29442..f2b07595f 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -16,7 +16,7 @@ The following providers are supported and tested at the moment: * Any other provider that authenticates using the environment variable While theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.]]> - 4.1.0 + 4.1.1 agpl Lukas Reschke User_SAML From 102cd00215b89f55d136967cab1cb2bf4fa60b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Se=C3=9Fner?= Date: Mon, 17 May 2021 21:59:41 +0200 Subject: [PATCH 33/38] Use dependency injection for avatar manager MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philipp Seßner --- appinfo/app.php | 3 ++- lib/UserBackend.php | 11 +++++++---- lib/UserData.php | 4 ---- tests/unit/UserBackendTest.php | 8 +++++++- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/appinfo/app.php b/appinfo/app.php index 3a6d7de62..83d00e46b 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -60,7 +60,8 @@ \OC::$server->getGroupManager(), $samlSettings, \OC::$server->getLogger(), - $userData + $userData, + \OC::$server->getAvatarManager() ); $userBackend->registerBackends(\OC::$server->getUserManager()->getBackends()); OC_User::useBackend($userBackend); diff --git a/lib/UserBackend.php b/lib/UserBackend.php index 7ba746201..512f85f09 100644 --- a/lib/UserBackend.php +++ b/lib/UserBackend.php @@ -26,6 +26,7 @@ use OCP\Authentication\IApacheBackend; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\Files\NotPermittedException; +use OCP\IAvatarManager; use OCP\IDBConnection; use OCP\ILogger; use OCP\IUser; @@ -60,6 +61,8 @@ class UserBackend implements IApacheBackend, UserInterface, IUserBackend { private $logger; /** @var UserData */ private $userData; + /** @var IAvatarManager */ + private $avatarManager; public function __construct( IConfig $config, @@ -70,7 +73,8 @@ public function __construct( IGroupManager $groupManager, SAMLSettings $settings, ILogger $logger, - UserData $userData + UserData $userData, + IAvatarManager $avatarManager ) { $this->config = $config; $this->urlGenerator = $urlGenerator; @@ -81,6 +85,7 @@ public function __construct( $this->settings = $settings; $this->logger = $logger; $this->userData = $userData; + $this->avatarManager = $avatarManager; } /** @@ -735,9 +740,7 @@ private function setAvatarFromSamlProvider($uid, $image) { } try { - $avatarManager = \OC::$server->getAvatarManager(); - - $avatar = $avatarManager->getAvatar($uid); + $avatar = $this->avatarManager->getAvatar($uid); $avatar->set($image); return true; } catch (\Exception $e) { diff --git a/lib/UserData.php b/lib/UserData.php index ce762013d..098a9be10 100644 --- a/lib/UserData.php +++ b/lib/UserData.php @@ -26,7 +26,6 @@ use OCA\User_SAML\Exceptions\NoUserFoundException; use OCP\IConfig; -use OCP\Image; class UserData { private $uid; @@ -38,14 +37,11 @@ class UserData { private $samlSettings; /** @var IConfig */ private $config; - /** @var Image */ - private $image; public function __construct(UserResolver $userResolver, SAMLSettings $samlSettings, IConfig $config) { $this->userResolver = $userResolver; $this->samlSettings = $samlSettings; $this->config = $config; - $this->image = new Image(); } public function setAttributes(array $attributes): void { diff --git a/tests/unit/UserBackendTest.php b/tests/unit/UserBackendTest.php index 6325091aa..05c502144 100644 --- a/tests/unit/UserBackendTest.php +++ b/tests/unit/UserBackendTest.php @@ -24,6 +24,7 @@ use OCA\User_SAML\SAMLSettings; use OCA\User_SAML\UserBackend; use OCA\User_SAML\UserData; +use OCP\IAvatarManager; use OCP\IConfig; use OCP\IDBConnection; use OCP\IGroup; @@ -56,6 +57,8 @@ class UserBackendTest extends TestCase { private $SAMLSettings; /** @var \PHPUnit_Framework_MockObject_MockObject|ILogger */ private $logger; + /** @var \PHPUnit_Framework_MockObject_MockObject|IAvatarManager */ + private $avatarManager; protected function setUp(): void { parent::setUp(); @@ -69,6 +72,7 @@ protected function setUp(): void { $this->SAMLSettings = $this->getMockBuilder(SAMLSettings::class)->disableOriginalConstructor()->getMock(); $this->logger = $this->createMock(ILogger::class); $this->userData = $this->createMock(UserData::class); + $this->avatarManager = $this->createMock(IAvatarManager::class); } public function getMockedBuilder(array $mockedFunctions = []) { @@ -84,6 +88,7 @@ public function getMockedBuilder(array $mockedFunctions = []) { $this->SAMLSettings, $this->logger, $this->userData, + $this->avatarManager, ]) ->setMethods($mockedFunctions) ->getMock(); @@ -97,7 +102,8 @@ public function getMockedBuilder(array $mockedFunctions = []) { $this->groupManager, $this->SAMLSettings, $this->logger, - $this->userData + $this->userData, + $this->avatarManager ); } } From ebb4413f8736f59f0fc04dd9cc2dac09a7a447e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Se=C3=9Fner?= Date: Mon, 17 May 2021 22:35:23 +0200 Subject: [PATCH 34/38] Only update avatar image if its checksum value has changed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philipp Seßner --- lib/UserBackend.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/UserBackend.php b/lib/UserBackend.php index 512f85f09..9a7cdc115 100644 --- a/lib/UserBackend.php +++ b/lib/UserBackend.php @@ -716,7 +716,16 @@ public function updateAttributes($uid, $image = new \OCP\Image(); $fileData = file_get_contents($newAvatar); $image->loadFromData($fileData); - $this->setAvatarFromSamlProvider($uid, $image); + + $checksum = md5($image->data()); + if ($checksum !== $this->config->getUserValue($uid, 'user_saml', 'lastAvatarChecksum')) { + // use the checksum before modifications + if ($this->setAvatarFromSamlProvider($uid, $image)) { + // save checksum only after successful setting + $this->config->setUserValue($uid, 'user_saml', 'lastAvatarChecksum', $checksum); + var_dump('Avatar changed'); die(); + } + } } } } @@ -735,7 +744,7 @@ private function setAvatarFromSamlProvider($uid, $image) { return false; } - if (Filesystem::$loaded) { + if (!Filesystem::$loaded) { \OC_Util::setupFS($uid); } From fd4c9ae3c5e3e0c7e5fdeff3f6fa90cf257a6933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Se=C3=9Fner?= Date: Thu, 26 Aug 2021 13:19:23 +0200 Subject: [PATCH 35/38] #187 revert adding german translation as translations are done via transifex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philipp Seßner --- l10n/de.js | 1 - l10n/de_DE.js | 1 - l10n/de_DE.json | 1 - 3 files changed, 3 deletions(-) diff --git a/l10n/de.js b/l10n/de.js index 623573ecf..72959bd38 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -32,7 +32,6 @@ OC.L10N.register( "Attribute to map the quota to." : "Attribut, dem das Kontingent zugeordnet werden soll.", "Attribute to map the users groups to." : "Attribut, dem die Gruppen des Benutzers zugeordnet werden sollen.", "Attribute to map the users home to." : "Attribut, dem das zu Hause des Benutzers zugeordnet werden soll.", - "Attribute to map the users avatar to." : "Attribut, dem das das Profilbild des Benutzers zugeordnet werden soll.", "Email address" : "E-Mail-Adresse", "Encrypted" : "Verschlüsselt", "Entity" : "Einheit", diff --git a/l10n/de_DE.js b/l10n/de_DE.js index 43f4261c8..f22fb46de 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -32,7 +32,6 @@ OC.L10N.register( "Attribute to map the quota to." : "Attribut, dem das Speicherkontingent zugeordnet werden soll.", "Attribute to map the users groups to." : "Attribut, dem die Gruppen des Benutzers zugeordnet werden sollen.", "Attribute to map the users home to." : "Attribut dem das zu Hause des Benutzers zugeordnet werden soll.", - "Attribute to map the users avatar to." : "Attribut, dem das das Profilbild des Benutzers zugeordnet werden soll.", "Email address" : "E-Mail-Adresse", "Encrypted" : "Verschlüsselt", "Entity" : "Einheit", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index c6d9e283b..ceb568ce9 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -30,7 +30,6 @@ "Attribute to map the quota to." : "Attribut, dem das Speicherkontingent zugeordnet werden soll.", "Attribute to map the users groups to." : "Attribut, dem die Gruppen des Benutzers zugeordnet werden sollen.", "Attribute to map the users home to." : "Attribut dem das zu Hause des Benutzers zugeordnet werden soll.", - "Attribute to map the users avatar to." : "Attribut, dem das das Profilbild des Benutzers zugeordnet werden soll.", "Email address" : "E-Mail-Adresse", "Encrypted" : "Verschlüsselt", "Entity" : "Einheit", From e21126be2cfaeca6de63b672766ba12bc3289b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Se=C3=9Fner?= Date: Wed, 6 Jul 2022 11:59:04 +0200 Subject: [PATCH 36/38] fix code style --- lib/UserBackend.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/UserBackend.php b/lib/UserBackend.php index 83e5306ce..ff03889cd 100644 --- a/lib/UserBackend.php +++ b/lib/UserBackend.php @@ -107,7 +107,7 @@ public function canChangeAvatar($uid) { } try { return empty(trim($this->getAttributeKeys('saml-attribute-mapping-avatar_mapping')[0])); - } catch(\InvalidArgumentException $e) { + } catch (\InvalidArgumentException $e) { return true; } } From 7e7584c641f61ea8fb960f7a43aba2723bd048bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Se=C3=9Fner?= Date: Wed, 6 Jul 2022 12:04:04 +0200 Subject: [PATCH 37/38] fix code style and errors in code --- lib/UserBackend.php | 2 -- tests/unit/Settings/AdminTest.php | 10 +++++----- tests/unit/UserBackendTest.php | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/UserBackend.php b/lib/UserBackend.php index ff03889cd..81be24027 100644 --- a/lib/UserBackend.php +++ b/lib/UserBackend.php @@ -40,7 +40,6 @@ use Symfony\Component\EventDispatcher\GenericEvent; use OCP\EventDispatcher\IEventDispatcher; use OCP\User\Events\UserChangedEvent; -use function base64_decode; class UserBackend implements IApacheBackend, UserInterface, IUserBackend { /** @var IConfig */ @@ -724,7 +723,6 @@ public function updateAttributes($uid, if ($this->setAvatarFromSamlProvider($uid, $image)) { // save checksum only after successful setting $this->config->setUserValue($uid, 'user_saml', 'lastAvatarChecksum', $checksum); - var_dump('Avatar changed'); die(); } } } diff --git a/tests/unit/Settings/AdminTest.php b/tests/unit/Settings/AdminTest.php index ab4efc473..a131cd9b5 100644 --- a/tests/unit/Settings/AdminTest.php +++ b/tests/unit/Settings/AdminTest.php @@ -147,11 +147,11 @@ public function formDataProvider() { 'type' => 'line', 'required' => true, ], - 'avatar_mapping' => [ - 'text' => $this->l10n->t('Attribute to map the users avatar to.'), - 'type' => 'line', - 'required' => true, - ], + 'avatar_mapping' => [ + 'text' => $this->l10n->t('Attribute to map the users avatar to.'), + 'type' => 'line', + 'required' => true, + ], ]; $nameIdFormats = [ diff --git a/tests/unit/UserBackendTest.php b/tests/unit/UserBackendTest.php index 35996ac53..c77736363 100644 --- a/tests/unit/UserBackendTest.php +++ b/tests/unit/UserBackendTest.php @@ -94,7 +94,7 @@ public function getMockedBuilder(array $mockedFunctions = []) { $this->SAMLSettings, $this->logger, $this->userData, - $this->eventDispatcher + $this->eventDispatcher, $this->avatarManager, ]) ->setMethods($mockedFunctions) From 02d1f1003e73a54cd959349ad869517287f8c016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Se=C3=9Fner?= Date: Wed, 6 Jul 2022 13:37:48 +0200 Subject: [PATCH 38/38] #187 change avatar config settings for database configuration --- appinfo/app.php | 2 +- lib/SAMLSettings.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/appinfo/app.php b/appinfo/app.php index 327350aeb..a170a7173 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -58,7 +58,7 @@ \OC::$server->getLogger(), $userData, \OC::$server->query(\OCP\EventDispatcher\IEventDispatcher::class), - \OC::$server->getAvatarManager(), + \OC::$server->getAvatarManager() ); $userBackend->registerBackends(\OC::$server->getUserManager()->getBackends()); OC_User::useBackend($userBackend); diff --git a/lib/SAMLSettings.php b/lib/SAMLSettings.php index be047c111..0a190b74f 100644 --- a/lib/SAMLSettings.php +++ b/lib/SAMLSettings.php @@ -65,6 +65,7 @@ class SAMLSettings { 'saml-attribute-mapping-group_mapping', 'saml-attribute-mapping-home_mapping', 'saml-attribute-mapping-quota_mapping', + 'saml-attribute-mapping-avatar_mapping', 'sp-x509cert', 'sp-name-id-format', 'sp-privateKey',