Merge back Release 0.15.4

CHANGELOG.md

@@ -3,8 +3,23 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 
-## [Unreleased]
-.
+## [Unreleased] - XXXX-XX-XX
+
+
+
+## [0.15.3] - 2021-06-14
+
+### Fixed
+- Fixed read LDAP attribute value 0 returned as null [#599](https://github.com/owncloud/user_ldap/issues/599)
+- Security: filter special characters from password field [#636](https://github.com/owncloud/user_ldap/issues/636)
+- LDAP multiple base dns break pagination [#307](https://github.com/owncloud/user_ldap/issues/307)
+
+### Changed
+- Add warning for disabling email login regarding strict login check [#581](https://github.com/owncloud/user_ldap/issues/581) (Requires 10.5.0)
+- Facelift [#597](https://github.com/owncloud/user_ldap/issues/597)
+- Bump libraries
+
+
 
 ## [0.15.2] - 2020-06-16
 
@@ -30,6 +45,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 ### Changed
 
 - Drop PHP 7.0 - [#474](https://github.com/owncloud/user_ldap/issues/474)
+- Requires ownCloud min-version 10.4
 
 ## [0.14.0] - 2019-11-11
 
@@ -128,7 +144,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 - Add hint for max search term length - [#105](https://github.com/owncloud/user_ldap/issues/105)
 - Allow proxy to check next server - [#101](https://github.com/owncloud/user_ldap/issues/101)
 
-[Unreleased]: https://github.com/owncloud/user_ldap/compare/v0.15.2...master
+[Unreleased]: https://github.com/owncloud/user_ldap/compare/v0.15.3...master
+[0.15.5]: https://github.com/owncloud/user_ldap/compare/v0.15.2...v0.15.3
 [0.15.2]: https://github.com/owncloud/user_ldap/compare/v0.15.1...v0.15.2
 [0.15.1]: https://github.com/owncloud/user_ldap/compare/v0.15.0...v0.15.1
 [0.15.0]: https://github.com/owncloud/user_ldap/compare/v0.14.0...v0.15.0

appinfo/info.xml

@@ -14,7 +14,7 @@ More information is available in the [LDAP User and Group Backend documentation]
 	</description>
 	<licence>AGPL</licence>
 	<author>Jörn Friedrich Dreyer, Tom Needham, Juan Pablo Villafañez Ramos, Dominik Schmidt and Arthur Schiwon</author>
-	<version>0.15.2</version>
+	<version>0.15.3</version>
 	<types>
 		<authentication/>
 	</types>

css/settings.css

@@ -1,6 +1,5 @@
-#ldap section {
-	margin-bottom: 2rem;
-	width: 100% !important;
+#ldap {
+	width: calc(100% - 40px);
 }
 
 @media all and (min-width: 768px) {
@@ -9,6 +8,10 @@
 	}
 }
 
+#ldap section {
+	margin-bottom: 2rem;
+}
+
 #ldap section h3 {
 	border-bottom: 1px solid #efefef;
 	margin-left: -41px;
@@ -75,6 +78,23 @@
 #ldap .tablerow .hint {
 	clear: both;
 	font-size: .8em;
+	position: relative;
+	padding-left: 1rem;
+}
+
+#ldap .tablerow .hint:before {
+	background: url('/core/img/actions/info.svg');
+    background-size: contain;
+	background-position: 50% 100%;
+	background-repeat: no-repeat;
+	display: inline-block;
+	height: 1.3em;
+	width: 1.3em;
+	margin-right: 0rem;
+	content: ' ';
+	position: absolute;
+	margin-left: -1rem;
+	top: 3px;
 }
 
 #ldap .tablerow .hint img {
@@ -215,14 +235,6 @@ select[multiple=multiple] + button {
 	cursor: wait;
 }
 
-#ldap .ldap_saving {
-	margin-right: 15px;
-	color: orange;
-	font-weight: bold;
-}
-
-#ldap .ldap_saving img { height: 15px; }
-
 #ldap .app-name .ldap_config_state_indicator_container {
 	display: inline-block;
 	margin-left: 2em;
@@ -269,15 +281,16 @@ select[multiple=multiple] + button {
 #ldap .header {
 	position: fixed;
 	background: #fff;
-	width: inherit;
 	top: 5.5em;
 	padding-top: 1.7em;
 	z-index: 1;
+	width: calc(100% - 40px);
 }
 
 @media all and (min-width: 768px) {
 	#ldap .header {
 		top: 3.5em;
+		width: 60%;
 	}
 }
 
@@ -312,14 +325,48 @@ select[multiple=multiple] + button {
 	left: 1.3em;
 }
 
-#ldap .ui-tabs .ui-tabs-nav li.stateIndicator {
+#ldap .ui-tabs .ui-tabs-nav li.stateIndicator,
+#ldap .ui-tabs .ui-tabs-nav li.ldap_saving_wrapper {
 	color: #333333;
 	border: none;
 	background: transparent;
-	padding: 0.7em 1.3em;
+	padding: 0.2rem 1.3rem;
 	display: none;
 }
 
+#ldap .ui-tabs .ui-tabs-nav li.ldap_saving_wrapper {
+	padding: 0.5rem 1.3rem;
+	display: block; 
+}
+
+#ldap .ui-tabs .ui-tabs-nav li.ldap_saving_wrapper .ldap_saving {
+	margin-right: 15px;
+	color: orange;
+	font-weight: bold;
+}
+
+#ldap .ui-tabs .ui-tabs-nav li.ldap_saving_wrapper .ldap_saving .done {
+	display: none;
+	color: #128c12;
+}
+
+#ldap .ui-tabs .ui-tabs-nav li.ldap_saving_wrapper .ldap_saving.done img {
+	display: none;
+}
+
+#ldap .ui-tabs .ui-tabs-nav li.ldap_saving_wrapper .ldap_saving.done .done {
+	display: inline;
+}
+
+#ldap .ui-tabs .ui-tabs-nav li.ldap_saving_wrapper .ldap_saving.done .working {
+	display: none;
+}
+
+#ldap .ui-tabs .ui-tabs-nav li.stateIndicator div {
+	font-weight: 100;
+	font-size: 75%;
+}
+
 @media all and (min-width: 768px) {
 	#ldap .ui-tabs .ui-tabs-nav li.stateIndicator {
 		display: block;

js/wizard/configModel.js

@@ -626,6 +626,9 @@ OCA = OCA || {};
 				configPrefix: configID,
 				errorMessage: _.isUndefined(result['message']) ? '' : result['message']
 			};
+
+			$('.ldap_config_state_indicator_subline').html('')
+
 			model._broadcast('deleteConfiguration', payload);
 		}
 	};

js/wizard/view.js

@@ -55,6 +55,16 @@ OCA = OCA || {};
 			});
 
 			$('.ldap_action_test_connection').click(this.onTestButtonClick);
+
+			$('#ldap_host').on('input', function () {				
+				$('.ldap_config_state_indicator_subline').html($('#ldap_host').val() + ':' + $('#ldap_port').val())
+			})
+
+			$('#ldap_port').on('input', function () {
+				$('.ldap_config_state_indicator_subline').html($('#ldap_host').val() + ':' + $('#ldap_port').val())
+			})
+
+			$('.ui-tabs .ui-tabs-panel').css('margin-top', $('#ldap .header').outerHeight())
 		},
 
 		/**
@@ -215,6 +225,9 @@ OCA = OCA || {};
 			view._updateStatusIndicator(view.STATUS_UNTESTED);
 			view.basicStatusCheck(view);
 			view.functionalityCheck();
+			if (view['configModel']['configuration']['ldap_host'] !== '')
+				$('.ldap_config_state_indicator_subline').html(view['configModel']['configuration']['ldap_host'] + ':' + view['configModel']['configuration']['ldap_port'])
+
 		},
 
 		/**
@@ -329,16 +342,22 @@ OCA = OCA || {};
 		 * shows a save spinner
 		 */
 		showSaveSpinner: function() {
-			this.$saveSpinners.removeClass('hidden');
+			this.$saveSpinners.show()
 			$('#ldap *').addClass('save-cursor');
 		},
 
 		/**
 		 * hides the save spinner
 		 */
 		hideSaveSpinner: function() {
-			this.$saveSpinners.addClass('hidden');
-			$('#ldap *').removeClass('save-cursor');
+			this.$saveSpinners.addClass('done')
+			setTimeout(function() {
+				$('#ldap .ldap_saving').fadeOut(1000, function () {
+					$('#ldap .ldap_saving').removeClass('done')
+				});
+				$('#ldap *').removeClass('save-cursor');
+
+			}, 1000)			
 		},
 
 		/**
@@ -471,7 +490,6 @@ OCA = OCA || {};
 })();
 
 $(document).ready(function () {
-	$('.ui-tabs .ui-tabs-panel').css('margin-top', $('#ldap .header').outerHeight())
     $(window).on('resize', function(){
 		$('.ui-tabs .ui-tabs-panel').css('margin-top', $('#ldap .header').outerHeight())
   	});

templates/part.wizard-loginfilter.php

@@ -7,14 +7,14 @@
 			<label for="ldap_loginfilter_username"><?php p($l->t('LDAP / AD Username:'));?></label>
 			<input type="checkbox" id="ldap_loginfilter_username" name="ldap_loginfilter_username" value="1" />
 			<div class="hint">
-				<img src="/core/img/actions/info.svg" class=""> <?php p($l->t('Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected.'));?>"
+				<?php p($l->t('Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected.'));?>
 			</div>
 		</div>
 		<div class="tablerow">
 			<label for="ldap_loginfilter_email"><?php p($l->t('LDAP / AD Email Address:'));?></label>
 			<input type="checkbox" id="ldap_loginfilter_email" name="ldap_loginfilter_email" value="1" />
 			<div class="hint">
-				<img src="/core/img/actions/info.svg" class=""> <?php p($l->t('Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed. WARNING: Disabling login with email might require enabling strict login checking to be effective, please refer to ownCloud documentation for more details!'));?>
+				<?php p($l->t('Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed. WARNING: Disabling login with email might require enabling strict login checking to be effective, please refer to ownCloud documentation for more details!'));?>
 			</div>
 
 		</div>
@@ -27,13 +27,13 @@
 		</div>
 		<div id="ldapReadOnlyLoginFilterContainer" class="hidden ldapReadOnlyFilterContainer tablerow">
 			<label><?php p($l->t('LDAP Filter:'));?></label>
-			<span class="ldapFilterReadOnlyElement ldapInputColElement"></span>
+			<div class="ldapFilterReadOnlyElement"></div>
 		</div>
 		<div id="rawLoginFilterContainer" class="tablerow invisible">
 			<label><?php p($l->t('Edit LDAP Query'));?></label>
 			<textarea type="text" id="ldap_login_filter" name="ldap_login_filter" class="ldapFilterInputElement"></textarea>
 			<div class="hint">
-				<img src="/core/img/actions/info.svg" class=""> <?php p($l->t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: "uid=%%uid"'));?>
+				<?php p($l->t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: "uid=%%uid"'));?>
 			</div>
 		</div>
 		<div class="tablerow">
@@ -44,7 +44,7 @@
 			<input type="text" id="ldap_test_loginname" name="ldap_test_loginname" class="ldapVerifyInput" />
 
 			<div class="hint">
-				<img src="/core/img/actions/info.svg" class=""> Attempts to receive a DN for the given loginname and the current login filter
+				Attempts to receive a DN for the given loginname and the current login filter
 			</div>
 			<button class="ldapVerifyLoginName" name="ldapTestLoginSettings" disabled="disabled"><?php p($l->t('Verify settings'));?></button>
 		</div>

templates/part.wizard-server.php

@@ -56,31 +56,31 @@ class="ldapIconCopy icon-default-style"
 				</div>
 			</div>
 			<div class="hint">
-				<img src="/core/img/actions/info.svg" class=""> <?php p($l->t('You can omit the protocol, except you require SSL. Then start with ldaps://')); ?>
+				<?php p($l->t('You can omit the protocol, except you require SSL. Then start with ldaps://')); ?>
 			</div>
 		</div>
 
 		<div class="tablerow">
 			<label for="ldap_tls"><?php p($l->t('Use StartTLS support')); ?></label>
 			<input type="checkbox" id="ldap_tls" name="ldap_tls" value="1">
 			<div class="hint">
-				<img src="/core/img/actions/info.svg" class=""> <?php p($l->t('Enable StartTLS support (also known as LDAP over TLS) for the connection.  Note that this is different than LDAPS (LDAP over SSL) which doesn\'t need this checkbox checked. You\'ll need to import the LDAP server\'s certificate in your %s server.', $theme->getName())); ?>
+				<?php p($l->t('Enable StartTLS support (also known as LDAP over TLS) for the connection.  Note that this is different than LDAPS (LDAP over SSL) which doesn\'t need this checkbox checked. You\'ll need to import the LDAP server\'s certificate in your %s server.', $theme->getName())); ?>
 			</div>
 		</div>
 
 		<div class="tablerow">
 			<label><?php p($l->t('User DN')); ?></label>
 			<input type="text" id="ldap_dn" name="ldap_dn" class="tablecell" autocomplete="off" />
 			<div class="hint">
-				<img src="/core/img/actions/info.svg" class=""> <?php p($l->t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.')); ?>
+				<?php p($l->t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.')); ?>
 			</div>
 		</div>
 
 		<div class="tablerow">
 			<label><?php p($l->t('Password')); ?></label>
 			<input type="password" id="ldap_agent_password" class="tablecell" name="ldap_agent_password" autocomplete="off" />
 			<div class="hint">
-				<img src="/core/img/actions/info.svg" class=""> <?php p($l->t('For anonymous access, leave DN and Password empty.')); ?>
+				<?php p($l->t('For anonymous access, leave DN and Password empty.')); ?>
 			</div>
 		</div>
 
@@ -89,7 +89,7 @@ class="ldapIconCopy icon-default-style"
 			<textarea id="ldap_base" name="ldap_base" class="tablecell" placeholder="" >
 			</textarea>
 			<div class="hint">
-				<img src="/core/img/actions/info.svg" class=""> <?php p($l->t('You can specify Base DN for users and groups in the Advanced tab')); ?>
+				<?php p($l->t('You can specify Base DN for users and groups in the Advanced tab')); ?>
 			</div>
 		</div>
 
@@ -105,7 +105,7 @@ class="ldapIconCopy icon-default-style"
 			</label>
 			<input type="checkbox" id="ldap_experienced_admin" value="1" name="ldap_experienced_admin" class="tablecell" />
 			<div class="hint">
-				<img src="/core/img/actions/info.svg" class=""> <?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.')); ?>
+				<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.')); ?>
 			</div>
 		</div>
 	</section>

templates/part.wizard-userfilter.php

@@ -7,7 +7,7 @@
 			<label for="ldap_userfilter_objectclass"><?php p($l->t('Only these object classes:'));?></label>
 			<select id="ldap_userfilter_objectclass" multiple="multiple" name="ldap_userfilter_objectclass" class="multiSelectPlugin"></select>
 			<div class="hint">
-				<img src="/core/img/actions/info.svg" > <?php p($l->t('The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin.'));?>
+				<?php p($l->t('The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin.'));?>
 			</div>
 		</div>
 
@@ -45,7 +45,7 @@
 			<label><?php p($l->t('Edit LDAP Query'));?></label>
 			<textarea type="text" id="ldap_userlist_filter" name="ldap_userlist_filter" class="ldapFilterInputElement"></textarea>
 			<div class="hint">
-				<img src="/core/img/actions/info.svg" > <?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', $theme->getName()));?>
+				<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', $theme->getName()));?>
 			</div>
 		</div>
 

templates/part.wizardcontrols.php

@@ -1,5 +1,4 @@
 <div class="ldapWizardControls">
-	<span class="ldap_saving hidden"><?php p($l->t('Saving'));?> <img class="wizSpinner" src="<?php p(image_path('core', 'loading.gif')); ?>"/></span>
 	<button class="ldap_action_back invisible" name="ldap_action_back"><?php p($l->t('Back'));?></button>
 	<button class="ldap_action_continue" name="ldap_action_continue"><?php p($l->t('Continue'));?></button>
 </div>