diff options
Diffstat (limited to 'lib/plugins/authad')
23 files changed, 163 insertions, 42 deletions
diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php index b6b5dd268..fcbd2eeef 100644 --- a/lib/plugins/authad/auth.php +++ b/lib/plugins/authad/auth.php @@ -489,6 +489,11 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin { $this->cando['modPass'] = false; } + // adLDAP expects empty user/pass as NULL, we're less strict FS#2781 + if(empty($opts['admin_username'])) $opts['admin_username'] = null; + if(empty($opts['admin_password'])) $opts['admin_password'] = null; + + // user listing needs admin priviledges if(!empty($opts['admin_username']) && !empty($opts['admin_password'])) { $this->cando['getUsers'] = true; } else { diff --git a/lib/plugins/authad/conf/default.php b/lib/plugins/authad/conf/default.php index 9274db209..f71202cfc 100644 --- a/lib/plugins/authad/conf/default.php +++ b/lib/plugins/authad/conf/default.php @@ -4,8 +4,8 @@ $conf['account_suffix'] = ''; $conf['base_dn'] = ''; $conf['domain_controllers'] = ''; $conf['sso'] = 0; -$conf['admin_username'] = ''; -$conf['admin_password'] = ''; +$conf['admin_username'] = ''; +$conf['admin_password'] = ''; $conf['real_primarygroup'] = 0; $conf['use_ssl'] = 0; $conf['use_tls'] = 0; diff --git a/lib/plugins/authad/conf/metadata.php b/lib/plugins/authad/conf/metadata.php index fbc3f163c..7b4f895d0 100644 --- a/lib/plugins/authad/conf/metadata.php +++ b/lib/plugins/authad/conf/metadata.php @@ -1,14 +1,14 @@ <?php -$meta['account_suffix'] = array('string'); -$meta['base_dn'] = array('string'); -$meta['domain_controllers'] = array('string'); -$meta['sso'] = array('onoff'); -$meta['admin_username'] = array('string'); -$meta['admin_password'] = array('password'); -$meta['real_primarygroup'] = array('onoff'); -$meta['use_ssl'] = array('onoff'); -$meta['use_tls'] = array('onoff'); -$meta['debug'] = array('onoff'); -$meta['expirywarn'] = array('numeric', '_min'=>0); -$meta['additional'] = array('string'); +$meta['account_suffix'] = array('string','_caution' => 'danger'); +$meta['base_dn'] = array('string','_caution' => 'danger'); +$meta['domain_controllers'] = array('string','_caution' => 'danger'); +$meta['sso'] = array('onoff','_caution' => 'danger'); +$meta['admin_username'] = array('string','_caution' => 'danger'); +$meta['admin_password'] = array('password','_caution' => 'danger'); +$meta['real_primarygroup'] = array('onoff','_caution' => 'danger'); +$meta['use_ssl'] = array('onoff','_caution' => 'danger'); +$meta['use_tls'] = array('onoff','_caution' => 'danger'); +$meta['debug'] = array('onoff','_caution' => 'security'); +$meta['expirywarn'] = array('numeric', '_min'=>0,'_caution' => 'danger'); +$meta['additional'] = array('string','_caution' => 'danger'); diff --git a/lib/plugins/authad/lang/cs/settings.php b/lib/plugins/authad/lang/cs/settings.php index 71f83afda..28222d332 100644 --- a/lib/plugins/authad/lang/cs/settings.php +++ b/lib/plugins/authad/lang/cs/settings.php @@ -1,7 +1,8 @@ <?php + /** - * Czech language file - * + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * * @author mkucera66@seznam.cz */ $lang['account_suffix'] = 'Přípona vašeho účtu, tj. <code>@moje.domena.org</code>'; diff --git a/lib/plugins/authad/lang/de-informal/settings.php b/lib/plugins/authad/lang/de-informal/settings.php index 4d0b93e5d..782cf7c0f 100644 --- a/lib/plugins/authad/lang/de-informal/settings.php +++ b/lib/plugins/authad/lang/de-informal/settings.php @@ -1,9 +1,11 @@ <?php + /** - * German (informal) language file - * + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * * @author Frank Loizzi <contact@software.bacal.de> * @author Matthias Schulte <dokuwiki@lupo49.de> + * @author Volker Bödker <volker@boedker.de> */ $lang['account_suffix'] = 'Dein Account-Suffix. Z.B. <code>@my.domain.org</code>'; $lang['base_dn'] = 'Dein Base-DN. Z.B. <code>DC=my,DC=domain,DC=org</code>'; diff --git a/lib/plugins/authad/lang/de/settings.php b/lib/plugins/authad/lang/de/settings.php index f4e86dedd..fd624ad02 100644 --- a/lib/plugins/authad/lang/de/settings.php +++ b/lib/plugins/authad/lang/de/settings.php @@ -1,7 +1,8 @@ <?php + /** - * German (informal) language file - * + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * * @author Frank Loizzi <contact@software.bacal.de> * @author Matthias Schulte <dokuwiki@lupo49.de> */ diff --git a/lib/plugins/authad/lang/eo/settings.php b/lib/plugins/authad/lang/eo/settings.php index 8bd34b439..ee672ecd3 100644 --- a/lib/plugins/authad/lang/eo/settings.php +++ b/lib/plugins/authad/lang/eo/settings.php @@ -1,7 +1,8 @@ <?php + /** - * Esperanto language file - * + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * */ $lang['account_suffix'] = 'Via konto-aldonaĵo, ekz. <code>@mia.domajno.lando</code>'; $lang['base_dn'] = 'Via baza DN, ekz. <code>DC=mia,DC=domajno,DC=lando</code>'; diff --git a/lib/plugins/authad/lang/es/settings.php b/lib/plugins/authad/lang/es/settings.php new file mode 100644 index 000000000..9d0aa80ac --- /dev/null +++ b/lib/plugins/authad/lang/es/settings.php @@ -0,0 +1,13 @@ +<?php + +/** + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * + * @author monica <may.dorado@gmail.com> + */ +$lang['account_suffix'] = 'Su cuenta, sufijo. Ejem. <code> @ my.domain.org </ code>'; +$lang['base_dn'] = 'Su base DN. Ejem. <code>DC=my,DC=dominio,DC=org</code>'; +$lang['domain_controllers'] = 'Una lista separada por coma de los controladores de dominios. Ejem. <code>srv1.dominio.org,srv2.dominio.org</code>'; +$lang['admin_username'] = 'Un usuario con privilegios de Active Directory con acceso a los datos de cualquier otro usuario. Opcional, pero es necesario para determinadas acciones como el envío de suscripciones de correos electrónicos.'; +$lang['admin_password'] = 'La contraseña del usuario anterior.'; +$lang['sso'] = 'En caso de inicio de sesión usará ¿Kerberos o NTLM?'; diff --git a/lib/plugins/authad/lang/fr/settings.php b/lib/plugins/authad/lang/fr/settings.php index 5480a3d44..d05390efc 100644 --- a/lib/plugins/authad/lang/fr/settings.php +++ b/lib/plugins/authad/lang/fr/settings.php @@ -1,7 +1,8 @@ <?php + /** - * French language file - * + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * * @author Bruno Veilleux <bruno.vey@gmail.com> */ $lang['account_suffix'] = 'Le suffixe de votre compte. Ex.: <code>@mon.domaine.org</code>'; diff --git a/lib/plugins/authad/lang/hu/settings.php b/lib/plugins/authad/lang/hu/settings.php new file mode 100644 index 000000000..c2cab410f --- /dev/null +++ b/lib/plugins/authad/lang/hu/settings.php @@ -0,0 +1,18 @@ +<?php +/** + * Hungarian language file + * + * @author Marton Sebok <sebokmarton@gmail.com> + */ +$lang['account_suffix'] = 'Felhasználói azonosító végződése, pl. <code>@my.domain.org</code>.'; +$lang['base_dn'] = 'Bázis DN, pl. <code>DC=my,DC=domain,DC=org</code>.'; +$lang['domain_controllers'] = 'Tartománykezelők listája vesszővel elválasztva, pl. <code>srv1.domain.org,srv2.domain.org</code>.'; +$lang['admin_username'] = 'Privilegizált AD felhasználó, aki az összes feéhasználó adatait elérheti. Elhagyható, de bizonyos funkciókhoz, például a feliratkozási e-mailek kiküldéséhez szükséges.'; +$lang['admin_password'] = 'Ehhez tartozó jelszó.'; +$lang['sso'] = 'Single-Sign-On Kerberos-szal vagy NTML használata?'; +$lang['real_primarygroup'] = 'A valódi elsődleges csoport feloldása a "Tartományfelhasználók" csoport használata helyett? (lassabb)'; +$lang['use_ssl'] = 'SSL használata? Ha használjuk, tiltsuk le a TLS-t!'; +$lang['use_tls'] = 'TLS használata? Ha használjuk, tiltsuk le az SSL-t!'; +$lang['debug'] = 'Debug-üzenetek megjelenítése?'; +$lang['expirywarn'] = 'Felhasználók értesítése ennyi nappal a jelszavuk lejárata előtt. 0 a funkció kikapcsolásához.'; +$lang['additional'] = 'Vesszővel elválasztott lista a további AD attribútumok lekéréshez. Néhány plugin használhatja.'; diff --git a/lib/plugins/authad/lang/it/settings.php b/lib/plugins/authad/lang/it/settings.php index 10ae72f87..2d68dad68 100644 --- a/lib/plugins/authad/lang/it/settings.php +++ b/lib/plugins/authad/lang/it/settings.php @@ -1,5 +1,18 @@ <?php + /** - * Italian language file - * + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * + * @author Edmondo Di Tucci <snarchio@gmail.com> */ +$lang['account_suffix'] = 'Il suffisso del tuo account. Eg. <code>@my.domain.org</code>'; +$lang['base_dn'] = 'Il tuo DN. base Eg. <code>DC=my,DC=domain,DC=org</code>'; +$lang['domain_controllers'] = 'Elenco separato da virgole di Domain Controllers. Eg. <code>srv1.domain.org,srv2.domain.org</code>'; +$lang['admin_username'] = 'Utente privilegiato di Active Directory con accesso ai dati di tutti gli utenti. Opzionale ma necessario per alcune attività come mandare email di iscrizione.'; +$lang['admin_password'] = 'La password dell\'utente soprascritto.'; +$lang['sso'] = 'Deve essere usato Single-Sign-On via Kerberos oppure NTLM?'; +$lang['use_ssl'] = 'Usare la connessione SSL? Se usata, non abilitare TSL qui sotto.'; +$lang['use_tls'] = 'Usare la connessione TSL? Se usata, non abilitare SSL qui sopra.'; +$lang['debug'] = 'Visualizzare output addizionale di debug per gli errori?'; +$lang['expirywarn'] = 'Giorni di preavviso per la scadenza della password dell\'utente. 0 per disabilitare.'; +$lang['additional'] = 'Valori separati da virgola di attributi AD addizionali da caricare dai dati utente. Usato da alcuni plugin.'; diff --git a/lib/plugins/authad/lang/ja/settings.php b/lib/plugins/authad/lang/ja/settings.php index fdc6fc434..72e5cc76e 100644 --- a/lib/plugins/authad/lang/ja/settings.php +++ b/lib/plugins/authad/lang/ja/settings.php @@ -1,6 +1,16 @@ <?php + /** - * Japanese language file - * + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * * @author Satoshi Sahara <sahara.satoshi@gmail.com> + * @author Hideaki SAWADA <chuno@live.jp> */ +$lang['account_suffix'] = 'アカウントの接尾語。例：<code>@my.domain.org</code>'; +$lang['base_dn'] = 'ベースDN。例：<code>DC=my,DC=domain,DC=org</code>'; +$lang['domain_controllers'] = 'ドメインコントローラのカンマ区切り一覧。例：<code>srv1.domain.org,srv2.domain.org</code>'; +$lang['admin_username'] = '全ユーザーデータへのアクセス権のある特権Active Directoryユーザー。任意ですが、メール通知の登録等の特定の動作に必要。'; +$lang['admin_password'] = '上記ユーザーのパスワード'; +$lang['debug'] = 'エラー時に追加のデバッグ出力を表示する？'; +$lang['expirywarn'] = '何日前からパスワードの有効期限をユーザーに警告する。0 の場合は無効'; +$lang['additional'] = 'ユーザデータから取得する追加AD属性のカンマ区切り一覧。いくつかのプラグインが使用する。'; diff --git a/lib/plugins/authad/lang/ko/settings.php b/lib/plugins/authad/lang/ko/settings.php index f2bf52681..2914bf47b 100644 --- a/lib/plugins/authad/lang/ko/settings.php +++ b/lib/plugins/authad/lang/ko/settings.php @@ -1,7 +1,8 @@ <?php + /** - * Korean language file - * + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * * @author Myeongjin <aranet100@gmail.com> */ $lang['account_suffix'] = '계정 접미어. 예를 들어 <code>@my.domain.org</code>'; diff --git a/lib/plugins/authad/lang/nl/settings.php b/lib/plugins/authad/lang/nl/settings.php index 933566d18..8f5c84043 100644 --- a/lib/plugins/authad/lang/nl/settings.php +++ b/lib/plugins/authad/lang/nl/settings.php @@ -1,7 +1,8 @@ <?php + /** - * Dutch language file - * + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * */ $lang['account_suffix'] = 'Je account domeinnaam. Bijv <code>@mijn.domein.org</code>'; $lang['base_dn'] = 'Je basis DN. Bijv. <code>DC=mijn,DC=domein,DC=org</code>'; diff --git a/lib/plugins/authad/lang/pl/settings.php b/lib/plugins/authad/lang/pl/settings.php new file mode 100644 index 000000000..9113c0e51 --- /dev/null +++ b/lib/plugins/authad/lang/pl/settings.php @@ -0,0 +1,10 @@ +<?php +/** + * Polish language file + * + */ +$lang['account_suffix'] = 'Przyrostek twojej nazwy konta np. <code>@my.domain.org</code>'; +$lang['admin_password'] = 'Hasło dla powyższego użytkownika.'; +$lang['use_ssl'] = 'Użyć połączenie SSL? Jeśli tak to nie aktywuj TLS poniżej.'; +$lang['use_tls'] = 'Użyć połączenie TLS? Jeśli tak to nie aktywuj SSL powyżej.'; +$lang['expirywarn'] = 'Dni poprzedzających powiadomienie użytkownika o wygasającym haśle. 0 aby wyłączyć.'; diff --git a/lib/plugins/authad/lang/pt-br/settings.php b/lib/plugins/authad/lang/pt-br/settings.php index 29f8db4ad..76fb419a6 100644 --- a/lib/plugins/authad/lang/pt-br/settings.php +++ b/lib/plugins/authad/lang/pt-br/settings.php @@ -1,14 +1,18 @@ <?php + /** - * Brazilian Portuguese language file - * + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * * @author Victor Westmann <victor.westmann@gmail.com> + * @author Frederico Guimarães <frederico@teia.bio.br> */ $lang['account_suffix'] = 'Sufixo de sua conta. Eg. <code>@meu.domínio.org</code>'; $lang['base_dn'] = 'Sua base DN. Eg. <code>DC=meu,DC=domínio,DC=org</code>'; $lang['domain_controllers'] = 'Uma lista de controles de domínios separada por vírgulas. Eg. <code>srv1.domínio.org,srv2.domínio.org</code>'; +$lang['admin_username'] = 'Um usuário do Active Directory com privilégios para acessar os dados de todos os outros usuários. Opcional, mas necessário para realizar certas ações, tais como enviar mensagens de assinatura.'; $lang['admin_password'] = 'A senha do usuário acima.'; $lang['sso'] = 'Usar Single-Sign-On através do Kerberos ou NTLM?'; +$lang['real_primarygroup'] = 'O grupo primário real deve ser resolvido ao invés de assumirmos como "Usuários do Domínio" (mais lento)'; $lang['use_ssl'] = 'Usar conexão SSL? Se usar, não habilitar TLS abaixo.'; $lang['use_tls'] = 'Usar conexão TLS? se usar, não habilitar SSL acima.'; $lang['debug'] = 'Mostrar saída adicional de depuração em mensagens de erros?'; diff --git a/lib/plugins/authad/lang/pt/settings.php b/lib/plugins/authad/lang/pt/settings.php new file mode 100644 index 000000000..45eff5e96 --- /dev/null +++ b/lib/plugins/authad/lang/pt/settings.php @@ -0,0 +1,12 @@ +<?php + +/** + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * + * @author André Neves <drakferion@gmail.com> + */ +$lang['admin_password'] = 'A senha para o utilizador acima.'; +$lang['sso'] = 'Deve ser usado o Single-Sign-On via Kerberos ou NTLM?'; +$lang['use_ssl'] = 'Usar ligação SSL? Se usada, não ative TLS abaixo.'; +$lang['use_tls'] = 'Usar ligação TLS? Se usada, não ative SSL abaixo.'; +$lang['expirywarn'] = 'Número de dias de avanço para avisar o utilizador da expiração da senha. 0 para desativar.'; diff --git a/lib/plugins/authad/lang/ru/settings.php b/lib/plugins/authad/lang/ru/settings.php index 4c394080e..f849c201a 100644 --- a/lib/plugins/authad/lang/ru/settings.php +++ b/lib/plugins/authad/lang/ru/settings.php @@ -1,6 +1,9 @@ <?php + /** - * Russian language file - * + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua) + * @author Aleksandr Selivanov <alexgearbox@gmail.com> */ +$lang['admin_password'] = 'Пароль для указанного пользователя.'; diff --git a/lib/plugins/authad/lang/sk/settings.php b/lib/plugins/authad/lang/sk/settings.php new file mode 100644 index 000000000..0cc9b9b10 --- /dev/null +++ b/lib/plugins/authad/lang/sk/settings.php @@ -0,0 +1,11 @@ +<?php + +/** + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * + * @author Martin Michalek <michalek.dev@gmail.com> + */ +$lang['admin_password'] = 'Heslo vyššie uvedeného používateľa.'; +$lang['use_ssl'] = 'Použiť SSL pripojenie? Ak áno, nepovoľte TLS nižšie.'; +$lang['use_tls'] = 'Použiť TLS pripojenie? Ak áno, nepovoľte SSL vyššie.'; +$lang['debug'] = 'Zobraziť doplňujúce ladiace informácie pri chybe?'; diff --git a/lib/plugins/authad/lang/sv/settings.php b/lib/plugins/authad/lang/sv/settings.php new file mode 100644 index 000000000..17eb523a8 --- /dev/null +++ b/lib/plugins/authad/lang/sv/settings.php @@ -0,0 +1,12 @@ +<?php + +/** + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * + * @author Smorkster Andersson smorkster@gmail.com + */ +$lang['account_suffix'] = 'Ditt konto suffix. T.ex. <code>min.domän.org</code>'; +$lang['admin_password'] = 'Lösenord för användare ovan.'; +$lang['sso'] = 'Ska Single-Sign-On via Kerberos eller NTLM användas?'; +$lang['use_ssl'] = 'Använda SSL anslutning? Om använd, möjliggör inte TLS nedan.'; +$lang['use_tls'] = 'Använda TLS anslutning? Om använd, möjliggör inte SSL ovan.'; diff --git a/lib/plugins/authad/lang/zh-tw/settings.php b/lib/plugins/authad/lang/zh-tw/settings.php index c46e5f96f..bd5d9413a 100644 --- a/lib/plugins/authad/lang/zh-tw/settings.php +++ b/lib/plugins/authad/lang/zh-tw/settings.php @@ -1,7 +1,8 @@ <?php + /** - * Chinese Traditional language file - * + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * * @author syaoranhinata@gmail.com */ $lang['account_suffix'] = '您的帳號後綴。如： <code>@my.domain.org</code>'; diff --git a/lib/plugins/authad/lang/zh/settings.php b/lib/plugins/authad/lang/zh/settings.php index 0ad8d4e4f..84bdc1e5c 100644 --- a/lib/plugins/authad/lang/zh/settings.php +++ b/lib/plugins/authad/lang/zh/settings.php @@ -1,7 +1,8 @@ <?php + /** - * Chinese language file - * + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * * @author lainme <lainme993@gmail.com> */ $lang['account_suffix'] = '您的账户后缀。例如 <code>@my.domain.org</code>'; diff --git a/lib/plugins/authad/plugin.info.txt b/lib/plugins/authad/plugin.info.txt index 996813bc5..3af1ddfbe 100644 --- a/lib/plugins/authad/plugin.info.txt +++ b/lib/plugins/authad/plugin.info.txt @@ -2,6 +2,6 @@ base authad author Andreas Gohr email andi@splitbrain.org date 2013-04-25 -name Active Directory auth plugin -desc Provides authentication against a Microsoft Active Directory +name Active Directory Auth Plugin +desc Provides user authentication against a Microsoft Active Directory url http://www.dokuwiki.org/plugin:authad |