Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6e13bd9 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'lowercase-login-forced' into 'master' 

Base on 19.0.8 + lowercase username input

See merge request !8
parents bda3ec31 89ff99bd

Dockerfile

+3 −2
Original line number Diff line number Diff line 
FROM nextcloud:19.0.7-fpm

FROM nextcloud:19.0.8-fpm

RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images

COPY patches/ /tmp/build_patches/

RUN sed -i 's/19,0,7,1/19,0,7,3/g' /usr/src/nextcloud/version.php

RUN sed -i 's/19,0,8,1/19,0,8,2/g' /usr/src/nextcloud/version.php

#RUN patch -u /usr/src/nextcloud/core/signature.json -i /tmp/build_patches/001-sha512-signature.patch

RUN patch -u /usr/src/nextcloud/core/Controller/LoginController.php -i /tmp/build_patches/002-login-without-domain.patch

RUN patch -u /usr/src/nextcloud/core/templates/layout.user.php -i /tmp/build_patches/003-contact-search-removal.patch

RUN patch -u /usr/src/nextcloud/core/Controller/ContactsMenuController.php -i /tmp/build_patches/004-contact-search-controller-removal.patch
 
 No newline at end of file

patches/001-sha512-signature.patch

0 → 100644
+25 −0
Original line number Diff line number Diff line 
--- files/signature_1908.json	2021-02-04 12:42:17.000000000 +0100

+++ files/signature_1908-patched.json	2021-02-04 12:43:42.000000000 +0100

@@ -4873,11 +4873,11 @@

         "core\/Controller\/ClientFlowLoginController.php": "71587f8fe5e11d3ae3d4cbc1ac27dc85ede307c77152bf0633ad2edfd990be7eebd1f5d39b1e7667139773e28577c8b1dc35d08dce094cca58846bd894039447",

         "core\/Controller\/ClientFlowLoginV2Controller.php": "ff0bd22fb9d921f8c5d76881bfadcafae6681a561cfd8bcb1a86a0c6376fda06613bf44c9976908b7ede8d4d4f9cd4da8bcc688387cd26212780dc963a9be356",

         "core\/Controller\/CollaborationResourcesController.php": "d56b420c51e4a85d8c998d9aeaa13fc044334f33e06a37d9b9f79541317ff6f9b987fbca954273285e412403f33ac22580855939bdb1923cdcc75f61a7e2d349",

-        "core\/Controller\/ContactsMenuController.php": "3d5184a92a17914659a00f99768c51e5e86cba89409c862de8cab2051fc69bbd4b3bd3634ada375f7bf456284c1fed26c95e6a4b2bac8721c40b7c0922e236b5",

+        "core\/Controller\/ContactsMenuController.php": "da33f2e16937fe82641e14eb032a2d3666f52450b36474ea4543937f3400fe0b82c2a0b0c6f5a1d3b00d97e23f744161551f93d36297fb12e17c4b72cfcd77b9",

         "core\/Controller\/CssController.php": "755803437284837250c5e13bf8e3764d2d96a2b29712f1e36e0c8f7e7ff684b438c5b06c3ac7da6c8e5ddd39ba5c7a8bdd4e258f902e50d3b45b5003c9c673c1",

         "core\/Controller\/GuestAvatarController.php": "095faa68bd569a77ddb7b1d67aaca87b02c731deb70d21391191e66bede5ea1e06226c23f70c05a27608557eb599a65b3f923f66f39d24ae80b52061990d79d3",

         "core\/Controller\/JsController.php": "46019b859527ee13bb248bcf64e6cdaf0c792d04b48871e569e0fe2c2f884e425d85623b5a7bf6c750fb85023eeede9aa13db94028e9e41133ac624b9b75aa8c",

-        "core\/Controller\/LoginController.php": "600ef1e0c70f532ea07f7240ddd7090d4016a13c52b9a925e89226966b5e976a358f01c2f222e661fd126a25ec8289bde5dd6027aa2f51a742ec9931c33e2f35",

+        "core\/Controller\/LoginController.php": "29517ffc4ab6436e44ab33e17d28234e1ea7fa0376618596ed13033e925d3598c69c7faefa3419f5f677103c730837a18c5395946ba673df8dc9b01cd2b1b23d",

         "core\/Controller\/LostController.php": "c9a7867646ef47466c0626f92052afa3442aa8c5a642b991a3936421ac7a64904611d5a6d66ccbdf3290bb5b2bcda094cf5cc7fc051863b27a07a0cf1e7c9f4d",

         "core\/Controller\/NavigationController.php": "b0b558b7b561fd5396e19168ba46da932eaf5b813a6600e4b59829ec82d625407b47f08249b1791dd1a7066beed87fcf6bf8b09691799ad269310d6535a7cd37",

         "core\/Controller\/OCJSController.php": "1dca2b59d295d3d533d3874f4a9efbe21747d505ff1381dd020bbac7993bd322f5ab883406bbd611af04b07998432585b11122067058fae33b2d8501bf5166da",

@@ -5960,7 +5960,7 @@

         "core\/templates\/layout.guest.php": "811fa50d904f8aa71b8d447a4e605448f41e461e0cc87fb855cdaced13e49cf30e4aecd27eab35faa2c56717bea9dd01131d92e10df0a5608d31e86687ff40b9",

         "core\/templates\/layout.noscript.warning.php": "285c39896a1349b320900d4f07354a5b7528d0a8e1c85451e05c8e20aec1d67c2b3fe62b38eb75064dfcef77fd3828d66435cb10f7520f68cf5a0063ac4fa0c8",

         "core\/templates\/layout.public.php": "a7225a5aabc6a349547360a0cae9e060e8e4ba7c1c0ca60957508d4e69bab01e808dfee9cf96331125376bc121f6b69b38e3610c108cbc5a40ed1147c34d23a1",

-        "core\/templates\/layout.user.php": "af6bb312eb862e61a77e9001ee854e9aab20c0ea479ac05da307ff7832ad6cc8b9d3532e2c83863bb5448f3f7328955d06caf11d8590a42c65c1d6c1376cfc9c",

+        "core\/templates\/layout.user.php": "23e530850fc01fde0ba3c3d114c575edd75756988d1aa10ebb84dbd6bec4e7e3f43d2d33dc8a02c4858ffefe722adb52b7e09c1d91bf9a2a6d4477966dd2f162",

         "core\/templates\/login.php": "d700a5edfd2dc67ffbc9e7410194d2ecd88fcba237a2c6fa3136d3ba8d38ba2893c8b0b759ddc5551a3c4ea25fe94b0276c220ea8501e278b9ee4ceae5d53155",

         "core\/templates\/loginflow\/authpicker.php": "981cba91b82b133f68bf802b8f53383f9c12ce9a895338fc7bea47d9eaff7e0815f6724db52f760d6f6bcd353b164932e47e6d31c12007c8d222b2d4fbf639c7",

         "core\/templates\/loginflow\/grant.php": "008e7dee5d572acf18ba404e95ca9acb4dc7e77769a02f8ef329bbb6cfee73affb86166f893406b876c74074beb5e7f20f27ff627392ade29e2a09e50505388f",

patches/002-login-without-domain.patch

+4 −3
Original line number Diff line number Diff line 
--- LoginController.original.php	2020-10-21 17:32:18.000000000 +0200

+++ LoginController.php	2020-10-21 18:03:51.000000000 +0200

@@ -289,6 +289,14 @@

--- files/LoginController.php	2021-02-04 11:20:48.000000000 +0100

+++ files/LoginController-new.php	2021-02-04 11:24:27.000000000 +0100

@@ -299,6 +299,15 @@

 			return $this->generateRedirect($redirect_url);

 		}

 

+		$user = trim($user);

+		$user = mb_strtolower($user, 'UTF-8');

+		$domain = $this->config->getSystemValue("mail_domain");

+		$domain_suffix = "@$domain";

+		$admin_username = $_ENV["NEXTCLOUD_ADMIN_USER"];