Commit Graph

2667 Commits

Author SHA1 Message Date
Christophe Maudoux
984df5c0c8 Allow to configure mail body for account registration 2021-07-26 23:06:47 +02:00
Christophe Maudoux
a6ecbf1ec8 Fix version & comment 2021-07-26 22:55:27 +02:00
Christophe Maudoux
1413fa7997 Append default cfgDate (#2566) 2021-07-26 12:02:50 +02:00
Clément OUDOT
a7809f10fe Update version in main modules 2021-07-22 17:53:50 +02:00
Clément OUDOT
b3aa5462e1 Do not use dashes in 'mot de passe' 2021-07-22 14:34:32 +02:00
Clément OUDOT
2c69e9b959 Tidy code (#2562) 2021-07-16 12:35:29 +02:00
Alex Kelly
da87299b1d Added --user and --group to override apache:apache for lmConfigEditor 2021-07-15 11:15:46 -04:00
Yadd
fe6ad903f1 Update manifests 2021-07-12 19:00:03 +02:00
Yadd
e4bf28906f Update tr translation from Transifex 2021-07-09 13:48:57 +02:00
Christophe Maudoux
a85e47ecca Allow to display password with dontStorePassword option & Update unit test (#2454) 2021-07-08 23:55:03 +02:00
Clément OUDOT
d9556aaa47 Add portalEnablePasswordDisplay parameter in manager (#2454) 2021-07-07 19:12:13 +02:00
Yadd
d7cbee5dbb Better conf backend errors report 2021-06-29 19:27:57 +02:00
Yadd
4a61606ee8 typo 2021-06-29 16:55:29 +02:00
Yadd
b0e7ba5d8a Fix URIRE 2021-06-29 16:50:39 +02:00
Yadd
83b45db614 Fix versions 2021-06-28 15:36:29 +02:00
Maxime Besson
b0ec1fbf76 Manager option for TOTP 2f register timeout 2021-06-28 11:36:44 +02:00
Yadd
7a219e1a61 Fix RDBI when configuration is forced (Closes: #2493) 2021-06-27 19:13:37 +02:00
Yadd
499e811ecf Fix test comment (#2493) 2021-06-27 10:21:27 +02:00
Christophe Maudoux
7f91820224 Display removed SF name (#1782) 2021-06-26 22:38:42 +02:00
Yadd
3d35c6454f Update manifests 2021-06-26 20:28:03 +02:00
Yadd
5aaf58e58f Add test for #2493: unable to reproduce 2021-06-26 20:26:32 +02:00
Maxime Besson
316c734bbc Merge branch 'fix-totp-options-2541' into v2.0 2021-06-25 13:55:53 +02:00
Maxime Besson
15054b9038 Extra precaution for #2539 2021-06-25 07:54:03 +02:00
Yadd
3732cdcc19 Better URL parsing (#2477) 2021-06-24 14:33:27 +02:00
Maxime Besson
b5ff5d2581 Improve phrasing of #2547 2021-06-24 09:35:17 +02:00
Yadd
fdf3d7dc10 Update Tr translation from Transifex 2021-06-21 19:24:56 +02:00
Maxime Besson
4aa9edb2cc Add manager option for userinfo signature alg (#2547) 2021-06-17 18:56:40 +02:00
Maxime Besson
85e34afa64 update tests for #2541 2021-06-15 14:54:32 +02:00
Maxime Besson
c197bd95b5 Remove totp2fDisplayExistingSecret and totp2fUserCanChangeKey (#2541) 2021-06-15 14:54:32 +02:00
Yadd
5fc0b6f002 Update tr translation from transifex 2021-06-07 18:34:06 +02:00
Maxime Besson
50225ce438 Add option to only allow declared oidc scopes (#2496) 2021-06-03 17:40:49 +02:00
Yadd
0f11d7c06e Finish BrowserID/Persona removal 2021-05-22 16:16:38 +02:00
Yadd
0b94a76481 Update tr translation from Transifex 2021-05-22 12:50:55 +02:00
Christophe Maudoux
c54204bd50 Reorder 2F options 2021-05-20 23:17:09 +02:00
Christophe Maudoux
630343bdbe Remove unused demoMode option (#2517) 2021-05-03 23:13:56 +02:00
Christophe Maudoux
6be4cfe035 Dismiss cache if cfgDate has changed (#2508) 2021-05-03 23:13:04 +02:00
Christophe Maudoux
8ae9985e7c Partial revert (#2508) 2021-05-02 22:09:46 +02:00
Christophe Maudoux
de3164fea7 Fix button top margin (#1976) 2021-05-01 22:35:56 +02:00
Yadd
d1d3cfa3f2 Update tr translation from transifex 2021-05-01 07:57:04 +02:00
Maxime Besson
76fdf0321c Add missing DBI config translations (#2520) 2021-04-27 16:48:02 +02:00
Maxime Besson
b418f768c8 Fix unit test for translations (#2520) 2021-04-27 16:41:31 +02:00
Christophe Maudoux
0f40e2d1bb Check conf. timestamp to reload (#2508) 2021-04-26 00:26:33 +02:00
Christophe Maudoux
21ced5dbad Fix speChars test, typos & display (#2509) 2021-04-14 13:28:12 +02:00
Yadd
6dd88c041e Update translations from Transifex 2021-04-09 18:14:59 +02:00
Maxime Besson
6f6239b6c3 Add manager option for #2506 2021-04-09 18:09:28 +02:00
Maxime Besson
715b78c34f Documentation for #2502 2021-04-07 17:20:44 +02:00
Yadd
f93c1bc394 format 2021-04-07 15:15:39 +02:00
Yadd
e6a2706c85 Update languages from transifex 2021-04-07 14:36:25 +02:00
Yadd
f930e449ab Order language keys 2021-04-07 13:46:32 +02:00
Christophe Maudoux
bcfb075f63 Be more consistent with REST params & Update doc (#1976) 2021-04-01 22:48:08 +02:00
Maxime Besson
824cd5fb89 Fix CLI for oidcOPMetaDataJSON (#2439)
and oidcOPMetaDataJWKS
2021-03-30 16:32:14 +02:00
Maxime Besson
dca8483ec5 Relax scope name constraints in manager (#2424) 2021-03-30 16:32:14 +02:00
Christophe Maudoux
098934682d Fix warning (#2486) 2021-03-26 21:54:21 +01:00
Maxime Besson
2c4d615c2f Fix 2F removal when session ids are hidden (#2483)
We don't need to hide persistent session IDs because they are not
security senstive (hash of login)
2021-03-10 14:02:52 +01:00
Maxime Besson
fd3b2d25ef Do not remove sessions/oidc consents from Angular when the XHR fails 2021-02-24 17:48:12 +01:00
Maxime Besson
4f5998029d Fix typo 2021-02-24 17:48:12 +01:00
Christophe Maudoux
f7caff32c7 Move CrowdSec plugin to Security menu (#2451) 2021-02-20 19:18:25 +01:00
Maxime Besson
5ebc43deb2 Remove debug statement (#2469) 2021-02-19 17:28:08 +01:00
Maxime Besson
93d54458df Add oidcRPMetaDataScopeRules to list of hash params (#2424) 2021-02-19 17:26:23 +01:00
Xavier Guimard
b5c0ca94c4 CrowdSec plugin (#2451) 2021-02-19 07:40:36 +01:00
Maxime Besson
122512f01a Fix deserialization of array conf attributes (#2469) 2021-02-18 22:08:47 +01:00
Christophe Maudoux
5f7981e256 Improve error message & unit test (#2458) 2021-02-16 22:04:38 +01:00
Christophe Maudoux
1f66e03969 Append an option to download rules.json file from remote server (#2458) 2021-02-16 12:15:18 +01:00
Christophe Maudoux
3bee740125 display headers (#2458) 2021-02-12 19:25:55 +01:00
Christophe Maudoux
6e1efc8bb5 WIP: CheckDevOps plugin skeleton (#2458) 2021-02-12 18:11:37 +01:00
Christophe Maudoux
e9c3d39883 Re-order Portal servers options 2021-02-11 22:50:47 +01:00
Christophe Maudoux
4515768513 Display explicit error message (#2329) 2021-02-10 22:27:12 +01:00
Christophe Maudoux
3e02682635 Update version 2021-02-09 23:06:36 +01:00
Christophe Maudoux
e1e86a44af Improve conf test (#2329) 2021-02-09 22:40:47 +01:00
Xavier Guimard
830954d9ab Update polish translation 2021-02-09 18:23:39 +01:00
Christophe Maudoux
62ef90aef3 Update conf tree (#2456) 2021-02-05 19:57:19 +01:00
Christophe Maudoux
5e28f76a64 Restrict session data available for DevOps handler (#2456) 2021-02-05 19:55:22 +01:00
Xavier Guimard
afc839a7b9 Transifex sync 2021-02-03 12:40:56 +01:00
Maxime Besson
21098bcce5 Add array handling for additional audiences (#2453) 2021-02-03 09:43:35 +01:00
Maxime Besson
f92df554bd Add manager test for #2419 2021-02-01 18:15:55 +01:00
Maxime Besson
39a419c1b1 Manager options for JWT access tokens (#2419) 2021-02-01 18:15:55 +01:00
Maxime Besson
39bc2525fe Add scopeRules to oidc providers api (#2424) 2021-02-01 16:25:36 +01:00
Maxime Besson
88cc6004a4 Add manager option for dynamic scopes (#2424) 2021-02-01 16:25:36 +01:00
Clément OUDOT
d4ae146fd6 Update version in main modules 2021-01-30 18:32:52 +01:00
Christophe Maudoux
c72a9d5228 Sort display options (#1658) 2021-01-30 18:20:54 +01:00
Xavier Guimard
7166a96c88 Add dependency to JSON::XS (Closes: #2442) 2021-01-29 06:31:23 +01:00
Christophe Maudoux
a60501b521 Update doc (#1976) 2021-01-28 09:49:48 +01:00
Christophe Maudoux
08b8705282 Fix regex to allow hash ref { key => val}->{key} 2021-01-26 19:05:39 +01:00
Christophe Maudoux
5f29cf10ff Test only if SAML service is enabled (#2341) 2021-01-23 18:58:34 +01:00
Christophe Maudoux
5d56a88ff3 Use strict & Typo 2021-01-23 18:57:24 +01:00
Maxime Besson
c289f6b853 Unit test for #2444 2021-01-20 09:49:46 +01:00
Maxime Besson
f0a6cf5b4f Auto generate key id when creating new oidc key (#2444) 2021-01-20 09:49:46 +01:00
Maxime Besson
c49c675ae0 Move oidc key id to key form (#2444) 2021-01-20 09:49:46 +01:00
Maxime Besson
c783ebc6d0 Add option to enable client credentials grant (#1987) 2021-01-19 17:06:21 +01:00
Christophe Maudoux
aad6244997 Merge branch 'v2.0' into findUser 2021-01-18 12:05:04 +01:00
Clément OUDOT
85e141b016 Upate MANIFEST 2021-01-17 16:57:56 +01:00
Clément OUDOT
8663c0104c Update version in main modules for 2.0.10 2021-01-17 16:56:51 +01:00
Xavier Guimard
186dff968a Reorder arabic strings 2021-01-15 22:45:23 +01:00
Clément OUDOT
e98bc432e6 Remove unused jquery and jquery-ui dependencies (#2361) 2021-01-15 10:12:01 +01:00
Christophe Maudoux
cd37ccc35c Merge branch 'v2.0' into findUser 2021-01-14 22:39:02 +01:00
Maxime Besson
05b04b0236 Fix redirectUri top level field in manager API (#2440) 2021-01-14 18:59:34 +01:00
Clément OUDOT
1dfbbe9fb3 Add addPostVars/delPostVars actions (#1978) 2021-01-10 17:46:03 +01:00
Clément OUDOT
0e40bab934 Do not sort array values (#1978) 2021-01-10 16:54:02 +01:00
Clément OUDOT
a281d78ba9 Display arrays hashref in CLI get command (#1978) 2021-01-10 16:46:17 +01:00
Christophe Maudoux
b5b311e8b5 Fix translation (#2436) 2021-01-08 18:41:44 +01:00
Christophe Maudoux
e4444c907f Append CheckUser normalized headers option & Improve unit test (#2436) 2021-01-08 18:38:05 +01:00
Maxime Besson
93988663b4 Add ldapGetUserBeforePasswordChange to manager (#714) 2021-01-08 15:09:19 +01:00
Christophe Maudoux
5d7675a5bd Update version (#1976) 2021-01-06 23:14:20 +01:00
Christophe Maudoux
dae9455a19 Merge branch 'v2.0' into findUser 2021-01-06 23:11:56 +01:00
Christophe Maudoux
d14fae87ce Append conf test & REST init test & set default values (#2176) 2021-01-06 23:10:09 +01:00
Christophe Maudoux
6af036b4f6 Fix regex & log (#2432) 2021-01-06 21:59:31 +01:00
Christophe Maudoux
39528ef1c3 Control parameters (#1976) & Improve unit tests 2021-01-05 22:46:35 +01:00
Christophe Maudoux
1c45e8a8c0 Merge branch 'v2.0' into findUser 2021-01-05 22:14:28 +01:00
Christophe Maudoux
846d6a3655 Allow wildcard with searching parameters (#1976) & Improve unit tests 2021-01-05 22:08:48 +01:00
Maxime Besson
127aa91a8f Merge branch 'feature-cas-service-url-2321' into 'v2.0'
Feature cas service url 2321

See merge request lemonldap-ng/lemonldap-ng!175
2021-01-05 18:49:24 +01:00
Maxime Besson
3c2ddd9029 Fix configuration test for #2321 2021-01-05 17:42:40 +01:00
Maxime Besson
1e1ab08d4c Add Password::Combination to manager (#714,#716) 2021-01-04 21:31:34 +01:00
Christophe Maudoux
fc6ea96954 FindUser with combination (#1976) 2021-01-03 19:00:20 +01:00
Christophe Maudoux
994ccfae30 Append REST findUser URL parameter (#1986) 2021-01-02 20:22:33 +01:00
Christophe Maudoux
a1700369c5 Merge branch 'v2.0' into findUser 2020-12-29 14:59:36 +01:00
Christophe Maudoux
fb525766f4 Improve conf test (#1976) 2020-12-29 00:37:01 +01:00
Maxime Besson
219aeb1547 tidy 2020-12-28 17:48:47 +01:00
Maxime Besson
099b1890bc call reloadUrls when saving config from the api (#2245) 2020-12-28 17:48:09 +01:00
Maxime Besson
279ea39e94 Move applyConf in Manager::Plugin (#2245) 2020-12-28 17:46:38 +01:00
Maxime Besson
13b1097304 Refactor SAML/CAS api to use value translation (#2318) 2020-12-28 15:47:20 +01:00
Maxime Besson
acef2ed5c6 Translate api option values from json bool to int (#2318) 2020-12-28 15:44:47 +01:00
Maxime Besson
ac4866f767 Fix error when updating saml sp via API (#2425) 2020-12-28 15:43:41 +01:00
Maxime Besson
b1545bce5b Revert "Translate incoming JSON bools (#2318)"
This reverts commit 85574cf97e.
2020-12-28 15:18:47 +01:00
Maxime Besson
a41be3511b tidy 2020-12-28 15:11:25 +01:00
Maxime Besson
9595a28d0e Unit test for #2347 2020-12-28 15:11:11 +01:00
Maxime Besson
82c696ea82 Handle postLogoutRedirectUris as array (#2347) 2020-12-28 15:10:35 +01:00
Maxime Besson
6f25d43bdf Refactor attribute handling in OIDC manager api (#2347) 2020-12-28 14:50:45 +01:00
Christophe Maudoux
c2342336c2 Merge branch 'v2.0' into findUser 2020-12-27 23:39:54 +01:00
Christophe Maudoux
c0f71ee0f1 Fix FindUSer with Choice (#1976) 2020-12-27 13:29:10 +01:00
Christophe Maudoux
406fdbc54b Append unit test if Impersonation is missing (#1976) 2020-12-26 15:27:25 +01:00
Christophe Maudoux
f30b3c4eb6 Conf test (#1976) 2020-12-23 23:07:22 +01:00
Christophe Maudoux
f956810e48 Redirect to Portal (#1976) 2020-12-23 22:47:08 +01:00
Christophe Maudoux
0236dc00d6 Removing workaround with MailPasswordReset 2020-12-23 14:57:55 +01:00
Maxime Besson
85574cf97e Translate incoming JSON bools (#2318) 2020-12-22 12:21:22 +01:00
Christophe Maudoux
e7baa348ba Update lang & conf test (#1976) 2020-12-21 22:31:29 +01:00
Christophe Maudoux
bfcdd370df Merge branch 'v2.0' into findUser 2020-12-21 21:11:55 +01:00
Christophe Maudoux
4d04672c20 WIP: FindUser skeleton (#1976) 2020-12-20 22:54:35 +01:00
Christophe Maudoux
512045c528 Fix conf test (#2243) 2020-12-20 17:29:13 +01:00
Christophe Maudoux
48df4a8807 Fix conf test & unit test (#2243) 2020-12-19 19:46:36 +01:00
Christophe Maudoux
7be0240389 Update default values & Tidy (#2243) 2020-12-16 22:58:01 +01:00
Christophe Maudoux
652d8ba9bc Prevent authentication on backend if account is locked (#2243) 2020-12-16 22:49:41 +01:00
Christophe Maudoux
763958831f Improve lang 2020-12-10 23:14:09 +01:00
Christophe Maudoux
df82d9d185 Take useSafeJail option into account in Manager &
Append an option to skip assignment test & Improve unit test (#2414, #2360)
2020-12-10 22:43:26 +01:00
Christophe Maudoux
2d2bcac4a7 Append warning (#2394) 2020-12-05 19:30:17 +01:00
Xavier Guimard
b5aec37089 Add Spanish translation (not finished but usable) 2020-12-04 13:11:01 +01:00
Clément OUDOT
afe516c761 Mail 2F session key in Manager (#2406) 2020-12-03 20:53:57 +01:00
Christophe Maudoux
c63c04c3e6 Fix unit test (#2360) 2020-12-02 08:04:52 +01:00
Christophe Maudoux
82187419a7 Warn if assignment & improve message (#2360) 2020-12-01 23:16:54 +01:00
Christophe Maudoux
ef0d10d91d Warn if assignment (#2360) 2020-12-01 22:58:14 +01:00
Christophe Maudoux
32d52b96d8 Append an option to obfuscate some headers value (#2398) 2020-11-27 23:09:18 +01:00
Xavier Guimard
28001c5f09 Add missing zh_TW flag 2020-11-27 13:17:04 +01:00
Xavier Guimard
54b778ddb7 Update zh_TW translation 2020-11-27 12:27:21 +01:00
Xavier Guimard
74f582baf4 Add zh_TW translation (portal) 2020-11-23 15:43:13 +01:00
Christophe Maudoux
0a4fabb4e4 Use strict & fix warnings 2020-11-21 19:24:04 +01:00
Christophe Maudoux
d8a3569ed0 Merge branch '2381' into 'v2.0'
2381

See merge request lemonldap-ng/lemonldap-ng!170
2020-11-16 17:22:26 +01:00
Xavier Guimard
e5924b1d9e Update translations 2020-11-16 09:58:19 +01:00
Christophe Maudoux
a8eaa59670 Encode uri (#2383) 2020-11-15 16:50:37 +01:00
Christophe Maudoux
d356455ed8 Merge branch 'v2.0' into 2381 2020-11-15 16:31:49 +01:00
Christophe Maudoux
1fdf5fbad1 Revert file 2020-11-15 14:58:46 +01:00
Christophe Maudoux
7e162f3468 Replace % char in URL with multi valued forms (#2383) 2020-11-15 14:18:58 +01:00
Christophe Maudoux
c330347f3c Replace % char in URL (#2383) 2020-11-15 13:43:35 +01:00
Christophe Maudoux
b40ae547f4 Update langs & test conf (#2381) 2020-11-12 19:52:48 +01:00
Olof Johansson
2cf4da6a15 manager: Adapt html to stricter rules in angularjs >= 1.8.0
label elements in XHTML must have a matching closing tag for strict
XHTML conformity; when upgrading to angularjs 1.8.0, this became
mandatory even when used with angular because of some potential XSS
issue.

Reference: https://docs.angularjs.org/guide/migration#migrating-from-1-7-to-1-8
2020-11-12 16:44:19 +01:00
Christophe Maudoux
a0feeae9a1 Append accessToTrace parameter (#2381) 2020-11-12 13:43:41 +01:00
Maxime Besson
dcfd2a8968 Remove warning when using special session keys in whatToTrace #2232 2020-11-12 09:48:30 +01:00
Xavier Guimard
10f879f652 Update tr translation 2020-11-10 06:08:34 +01:00
Maxime Besson
d5d97825a7 Update documentation for #2330 2020-11-06 19:00:52 +01:00
Maxime Besson
5714a753be Add manager form for OIDC attribute (#2330) 2020-11-06 19:00:52 +01:00
Xavier Guimard
d2698c7505 Update translations 2020-11-05 14:54:29 +01:00
Maxime Besson
8b9c6be6f6 Add krbAllowedDomains in manager (#2372) 2020-11-05 10:39:20 +01:00
Xavier Guimard
3f75702b96 Verify translations 2020-11-04 14:25:41 +01:00
Christophe Maudoux
602ccf91f6 Append parameters (#2368) 2020-11-04 13:49:51 +01:00
Christophe Maudoux
88b9c23fca Uppercase title (#2361) 2020-10-30 17:52:20 +01:00
Christophe Maudoux
0bb76720bb Adapt selector to jqlite (#2361) 2020-10-30 17:34:18 +01:00
Maxime Besson
e505e0e7e5 Encrypt session IDs to avoid disclosing them to admins (#2350) 2020-10-30 16:45:58 +01:00
Maxime Besson
abb66d716c Fix delete buttons for #2350
Since the session id may be hidden from the server response, we cannot
rely on the ajax response to set the session ID. Which is not a problem
because we already know it from context.
2020-10-30 16:45:58 +01:00
Christophe Maudoux
3cab5fbde6 Fix unit test (#2360) 2020-10-30 14:21:42 +01:00
Christophe Maudoux
42871a73c5 Warn if assignment (#2360) 2020-10-30 13:08:20 +01:00
Christophe Maudoux
b869b59da7 Avoid assignment (#2360) 2020-10-30 12:55:39 +01:00
Christophe Maudoux
600569247f WIP: Hide _session_id with session & 2ndFA explorers (#2350) 2020-10-28 09:31:12 +01:00
Maxime Besson
dd199e32b8 Add manager test for LDAPS connect timeout support (#2267) 2020-10-27 16:01:39 +01:00
Maxime Besson
1623c542a0 Add ldap IO timeout option to manager (#2267) 2020-10-27 16:01:36 +01:00
Xavier Guimard
b6c78511db Import tr translation from transifex 2020-10-26 20:06:16 +01:00
Xavier Guimard
5626852872 Refresh translations 2020-10-19 06:14:38 +02:00
Christophe Maudoux
53b1f0b059 Fix & improve unit tests (#2353) 2020-10-18 11:55:06 +02:00
Christophe Maudoux
b3ad81ec8c Display notification content (#2353) 2020-10-16 23:28:00 +02:00
Maxime Besson
ac3d521c5e API: remove confKey from PUT body 2020-10-14 14:18:17 +02:00
Maxime Besson
338958f269 API: add redirectUris to top level response 2020-10-14 11:37:13 +02:00
Maxime Besson
0ca8701ea7 Api: friendly error if confKey is empty during creation 2020-10-14 11:36:37 +02:00
Maxime Besson
2b4c76cf4d API: tidy CasApp.pm 2020-10-14 11:36:16 +02:00
Christophe Maudoux
bf9ecc35ad Re-order tree to be more consistent (#2336) 2020-10-12 16:59:14 +02:00
Christophe Maudoux
dd833c2843 Update doc (#1605) 2020-10-12 16:39:12 +02:00
Christophe Maudoux
1c574f03da Rule is not parsed -> convert to bool & be more consistent (#1605) 2020-10-12 15:38:57 +02:00
Christophe Maudoux
9f57ec474b Code refactoring (#2339) 2020-10-12 15:03:21 +02:00
Xavier Guimard
a78c7c5061 Update JS files 2020-10-10 10:03:55 +02:00
Maxime Besson
ca97628c04 Fix unit tests for #2431 2020-10-07 20:00:16 +02:00
Maxime Besson
834c09995c Fix unit tests for #2431 2020-10-07 19:46:56 +02:00
Maxime Besson
3a4d2f1939 Add a manager test to warn user when Lasso is too old for SHA2 (#2341) 2020-10-07 19:13:15 +02:00
Maxime Besson
f74787f81a Switch default SAML signature alg to SHA256 (#2341) 2020-10-07 15:35:37 +02:00
Maxime Besson
5606d0ed6f Add support for SHA384 and SHA512 (#2322) 2020-10-07 15:31:57 +02:00