Merge branch 'master' of https://git.bukova.info/repos/git/isspst

src/main/webapp/WEB-INF/ldap.properties

@@ -0,0 +1,2 @@
+ldap.server=ldap://localhost:3089
+ldap.userDNPattern=uid=\{0\},OU=people,DC=bukova,DC=info

src/main/webapp/WEB-INF/spring/database-auth.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:security="http://www.springframework.org/schema/security"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
+
+
+	<security:authentication-manager>
+		<security:authentication-provider user-service-ref="userService">
+			<security:password-encoder ref="passwordEncoder">
+				<security:salt-source user-property="username" />
+			</security:password-encoder>
+		</security:authentication-provider>
+	</security:authentication-manager>
+
+</beans>

src/main/webapp/WEB-INF/spring/ldap-auth.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:security="http://www.springframework.org/schema/security"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
+
+	<!-- LDAP -->
+	
+	<!-- embedded server only for testing -->
+	<security:ldap-server root="dc=bukova,dc=info" ldif="classpath:users.ldif" port="3089"/>
+	
+	<security:authentication-manager>
+		<security:authentication-provider ref="ldapAuthProvider"/>
+	</security:authentication-manager>
+	
+	<bean id="contextSource" class="org.springframework.security.ldap.DefaultSpringSecurityContextSource">
+		<constructor-arg value="${ldap.server}"/>
+	</bean>
+	
+	<bean id="authenticator" class="org.springframework.security.ldap.authentication.BindAuthenticator">
+	            <constructor-arg ref="contextSource"/>
+	            <property name="userDnPatterns">
+	                <list>
+	                    <value>${ldap.userDNPattern}</value>
+	                </list>
+	            </property>
+	</bean>
+
+	<bean id="populator" class="info.bukova.isspst.security.AuthPopulator">
+		<constructor-arg>
+		 	<ref local="userService"/>
+		 </constructor-arg>
+		 <constructor-arg>
+		 	<ref local="roleService"/>
+		 </constructor-arg>
+	</bean>
+	
+	<bean id="ldapAuthProvider"
+		class="org.springframework.security.ldap.authentication.LdapAuthenticationProvider">
+			<constructor-arg ref="authenticator"/>
+	        <constructor-arg ref="populator"/>
+	</bean>
+
+
+</beans>

src/main/webapp/WEB-INF/spring/root-context.xml

@@ -11,7 +11,14 @@
 	<context:annotation-config />
 	<context:component-scan base-package="info.bukova.isspst,org.zkoss.spring.beans.zkcomponents"></context:component-scan>
 
-	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" id="propertyConfigurer" p:location="/WEB-INF/jdbc.properties" />
+	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" id="propertyConfigurer">
+		<property name="locations">
+			<list>
+				<value>/WEB-INF/jdbc.properties</value>
+				<value>/WEB-INF/ldap.properties</value>
+			</list>
+		</property>
+	</bean>
 
 	<!-- Database -->
 	<bean id="dataSource"
@@ -52,7 +59,7 @@
 		<property name="permissionEvaluator" ref="permissionEvaluator" />
 	</bean>
 	
-	<bean id="permissionEvaluator" class="info.bukova.isspst.IsspstPermissionEvaluator"/>
+	<bean id="permissionEvaluator" class="info.bukova.isspst.security.IsspstPermissionEvaluator"/>
     
 	<security:http auto-config="true" use-expressions="true">
 		<security:intercept-url pattern="/app/**" access="hasAnyRole('ROLE_USER', 'ROLE_ADMIN')"/>
@@ -65,13 +72,8 @@
 		<security:logout invalidate-session="true"/>
 	</security:http>
 
-	<security:authentication-manager>
-		<security:authentication-provider user-service-ref="userService">
-			<security:password-encoder ref="passwordEncoder">
-				<security:salt-source user-property="username" />
-			</security:password-encoder>
-		</security:authentication-provider>
-	</security:authentication-manager>
+	<import resource="database-auth.xml"/>
+	<!-- <import resource="ldap-auth.xml"/> --> 
 
 	<bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
 		<property name="targetClass" value="org.springframework.security.core.context.SecurityContextHolder" />
@@ -81,7 +83,7 @@
 	
 	<bean id="passwordEncoder" class="org.springframework.security.authentication.encoding.ShaPasswordEncoder"/>
 	
-	<bean id="loginFail" class="info.bukova.isspst.LoginFailHandler"/>
+	<bean id="loginFail" class="info.bukova.isspst.security.LoginFailHandler"/>
     
     <!-- DAO -->
     <bean id="userDao" class="info.bukova.isspst.dao.jpa.UserDaoJPA">

src/main/webapp/admin/addressbook/address.zul

@@ -12,12 +12,10 @@
 			<column label="" hflex="min"/>
 			<column label="" hflex="min"/>
 			<column label=""/>
-			<column label=""/>
 		</columns>
 		<rows>
 			<row>
-				<label value="Firma" /> <textbox value="@bind(vm.dataBean.company)" instant="true"/>
-				<label visible="true" value="@load(vm.errMessages['company'])" style="color:red"/>
+				<label value="Firma" /> <textbox id="company" constraint="@load(vm.constriant)" value="@bind(vm.dataBean.company)" instant="true" width="320px"/>
 				<button image="/img/search.png" label="Hledat v ARESu" onClick="@command('searchAres')" sclass="nicebutton" disabled="@load((vm.dataBean.ic == 0) &amp;&amp; (empty vm.dataBean.company))" />				
 			</row>
 			<row>
@@ -33,14 +31,13 @@
 				<label value="Kontaktní osoba" /> <textbox value="@bind(vm.dataBean.contactName)"/>				
 			</row>
 			<row>
-				<label value="Ulice" /> <textbox value="@bind(vm.dataBean.street)"/>				
+				<label value="Ulice" /> <textbox value="@bind(vm.dataBean.street)" width="320px"/>				
 			</row>
 			<row>
-				<label value="Číslo domu" /> <textbox value="@bind(vm.dataBean.houseNumber)"/>				
+				<label value="Číslo domu" /> <textbox value="@bind(vm.dataBean.houseNumber)" width="80px"/>				
 			</row>
 			<row>
-				<label value="Město" /> <textbox value="@bind(vm.dataBean.city)"/>
-				<label visible="true" value="@load(vm.errMessages['city'])" style="color:red"/>				
+				<label value="Město" /> <textbox id="city" constraint="@load(vm.constriant)" value="@bind(vm.dataBean.city)" width="320px"/>				
 			</row>
 			<row>
 				<label value="PSČ" /> <textbox value="@bind(vm.dataBean.zipCode)"/>				
@@ -49,12 +46,10 @@
 				<label value="Telefon" /> <textbox value="@bind(vm.dataBean.phone)"/>				
 			</row>
 			<row>
-				<label value="E-mail" /> <textbox value="@bind(vm.dataBean.email)"/>
-				<label visible="true" value="@load(vm.errMessages['email'])" style="color:red"/>				
+				<label value="E-mail" /> <textbox id="email" constraint="@load(vm.constriant)" value="@bind(vm.dataBean.email)" width="320px"/>				
 			</row>
 			<row>
-				<label value="Web" /> <textbox value="@bind(vm.dataBean.web)"/>
-				<label visible="true" value="@load(vm.errMessages['web'])" style="color:red"/>				
+				<label value="Web" /> <textbox id="web" constraint="@load(vm.constriant)" value="@bind(vm.dataBean.web)" width="320px"/>				
 			</row>
 		</rows>
 	</grid>

src/main/webapp/app/passwd.zul

@@ -2,9 +2,10 @@
 <zk>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 
-<window id="passwd" title="Změnit heslo" border="normal" closable="true" width="350px"
+<window id="passwd" border="normal" closable="true" width="350px"
 	apply="org.zkoss.bind.BindComposer"
 	viewModel="@id('vm') @init('info.bukova.isspst.ui.users.PasswdVM')">
+	<caption src="/img/passwd.png" zclass="form-caption" label="Změnit heslo" />
 	<style src="/app/form.css"/>
 	<grid>
 		<columns>

src/main/webapp/buildings/buildingForm.zul

@@ -8,16 +8,12 @@
 				<columns>
 					<column align="right" hflex="min" />
 					<column />
-					<column />
 				</columns>
 				<rows>
 					<row>
 						<cell sclass="row-title">${labels.BuildingsFormCode} :</cell>
 						<cell>
-							<textbox width="200px" value="@bind(vm.dataBean.code)" />
-						</cell>
-						<cell>
-							<label visible="true" value="@load(vm.errMessages['code'])" style="color:red" />
+							<textbox id="code" constraint="@load(vm.constriant)" width="200px" value="@bind(vm.dataBean.code)" />
 						</cell>
 					</row>
 					<row>