Changeset 271

Timestamp:

10/04/06 00:11:15 (2 years ago)

Author:

laurentj

Message:

-patch 1525 : Ajout d'une commande d'effacement de cache
-fix Bug 8939 : sur l'affichage des erreurs, xhtml invalide
-fix Bug 8903 : mauvaise sortie d'erreur quand le log est impossible
-ajout d'une commande dans le make pour générer un paquet demoxul
-fix Bug 8785 : l'encryptage du mot de passe devrait dépendre du driver

ATTENTION : dans la config du plugin auth, le paramètre password_crypt_function
doit maintenant être placé dans la section Db ou Class

Files:

trunk/build/manifests/demoxul.mn (added)
trunk/build/manifests/jelix-dev.mn (modified) (1 diff)
trunk/build/mkmanifest.php (modified) (1 diff)
trunk/demoxul/var/config/index/auth.plugin.ini.php (modified) (2 diffs)
trunk/demoxul/var/config/jsonrpc/auth.plugin.ini.php (modified) (2 diffs)
trunk/demoxul/var/config/rdf/auth.plugin.ini.php (modified) (2 diffs)
trunk/demoxul/var/config/xmlrpc/auth.plugin.ini.php (modified) (2 diffs)
trunk/lib/jelix-modules/jxauth/plugins/auth/auth.plugin.ini.php.dist (modified) (2 diffs)
trunk/lib/jelix-scripts/commands/clearcache.cmd.php (added)
trunk/lib/jelix/auth/jAuth.class.php (modified) (5 diffs)
trunk/lib/jelix/auth/jAuthDriverClass.class.php (modified) (3 diffs)
trunk/lib/jelix/auth/jAuthDriverDb.class.php (modified) (2 diffs)
trunk/lib/jelix/core/jErrorHandler.lib.php (modified) (2 diffs)
trunk/lib/jelix/core/response/jResponseHtml.class.php (modified) (1 diff)
trunk/Makefile (modified) (4 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/build/manifests/jelix-dev.mn

r256	r271
114	114	createzone.cmd.php
115	115	createaction.cmd.php
	116	clearcache.cmd.php
116	117	cd lib/jelix-scripts/includes
117	118	command.class.php

trunk/build/mkmanifest.php

r89 r271

17 17
18 18 if($_SERVER['argc'] < 2){
19 echo "too few arguments\n repertoire1 [repertoire2] fichier.mn";
19 20 exit(1);
20 21 }

trunk/demoxul/var/config/index/auth.plugin.ini.php

r269	r271
2	2	;for security reasons , don't remove or modify the first line
3	3
4		; Db ou ~~Ldap~~
	4	; Db ou Class
5	5	driver = Db
6
7		~~; nom de la fonction globale qui sert �rypter le mot de passe~~
8		~~; peut �e vide, dans le cas o�driver prend en charge le cryptage~~
9		~~password_crypt_function = md5~~
10	6
11	7	; indique si il faut absolument ou non une authentification
…	…
54	50	dao = "jxauth~jelixuser"
55	51
	52	; nom de la fonction globale qui sert �rypter le mot de passe
	53	password_crypt_function = md5
	54

trunk/demoxul/var/config/jsonrpc/auth.plugin.ini.php

r269	r271
2	2	;for security reasons , don't remove or modify the first line
3	3
4		; Db ou ~~Ldap~~
	4	; Db ou Class
5	5	driver = Db
6
7		~~; nom de la fonction globale qui sert �rypter le mot de passe~~
8		~~; peut �e vide, dans le cas o�driver prend en charge le cryptage~~
9		~~password_crypt_function = md5~~
10	6
11	7	; indique si il faut absolument ou non une authentification
…	…
54	50	dao = "jxauth~jelixuser"
55	51
	52	; nom de la fonction globale qui sert �rypter le mot de passe
	53	password_crypt_function = md5
56	54

trunk/demoxul/var/config/rdf/auth.plugin.ini.php

r269	r271
2	2	;for security reasons , don't remove or modify the first line
3	3
4		; Db ou ~~Ldap~~
	4	; Db ou Class
5	5	driver = Db
6
7		~~; nom de la fonction globale qui sert �rypter le mot de passe~~
8		~~; peut �e vide, dans le cas o�driver prend en charge le cryptage~~
9		~~password_crypt_function = md5~~
10	6
11	7	; indique si il faut absolument ou non une authentification
…	…
53	49	[Db]
54	50	dao = "jxauth~jelixuser"
	51
	52	; nom de la fonction globale qui sert �rypter le mot de passe
	53	password_crypt_function = md5

trunk/demoxul/var/config/xmlrpc/auth.plugin.ini.php

r269	r271
2	2	;for security reasons , don't remove or modify the first line
3	3
4		; Db ou ~~Ldap~~
	4	; Db ou Class
5	5	driver = Db
6
7		~~; nom de la fonction globale qui sert �rypter le mot de passe~~
8		~~; peut �e vide, dans le cas o�driver prend en charge le cryptage~~
9		~~password_crypt_function = md5~~
10	6
11	7	; indique si il faut absolument ou non une authentification
…	…
54	50	dao = "jxauth~jelixuser"
55	51
56
	52	; nom de la fonction globale qui sert �rypter le mot de passe
	53	password_crypt_function = md5

trunk/lib/jelix-modules/jxauth/plugins/auth/auth.plugin.ini.php.dist

r259	r271
5	5	;============= Param�es g�raux
6	6
7		; Db ou ~~Ldap~~ ( respecter la casse des caract�s)
	7	; Db ou Class ( respecter la casse des caract�s)
8	8	driver = Db
9	9
10		; nom de la fonction globale qui sert �rypter le mot de passe
11		; peut �e vide, dans le cas o�driver prend en charge le cryptage
12		password_crypt_function = md5
	10
13	11
14	12	;============ Param�es pour le plugin
…	…
61	59	dao = "jxauth~jelixuser"
62	60
63		; param�es pour le driver ldap
64		;[Ldap]
65		;query_user = (cn=%s)
66		;query_list = (cn=*)
67		;login_field = uid
68		;password_field = userPassword
	61	; nom de la fonction globale qui sert �rypter le mot de passe
	62	password_crypt_function = md5
69	63
70		;~~[Ldapfields]~~
71		;~~// champs ldap = propriet�e jUser~~
72		;c~~n = name~~
73		;~~sn = firstname~~
	64	; param�es pour le driver class
	65	;[Class]
	66	;class = ""
	67	;password_crypt_function = md5

trunk/lib/jelix/auth/jAuth.class.php

r248	r271
173	173	public static function createUser($login,$password){
174	174	$dr = self::_getDriver();
175		return $dr->createUser($login, ~~self::cryptPassword($password)~~);
	175	return $dr->createUser($login,$password);
176	176	}
177	177
…	…
189	189	*/
190	190	public static function changePassword($login, $newpassword){
191		~~$newpassword = self::cryptPassword($newpassword);~~
192	191	$dr = self::_getDriver();
193	192	return $dr->changePassword($login, $newpassword);
…	…
198	197	*/
199	198	public static function verifyPassword($login, $password){
200		~~$password = self::cryptPassword($password);~~
201	199	$dr = self::_getDriver();
202	200	return $dr->verifyPassword($login, $password);
…	…
209	207
210	208	$dr = self::_getDriver();
211		~~$password = self::cryptPassword($password);~~
212	209	if($user = $dr->verifyPassword($login, $password)){
213	210
…	…
241	238	}
242	239
243		public static function cryptPassword($password){
244		$conf = self::_getConfig();
245		$f=$conf['password_crypt_function'];
246		if( $f != '')
247		$password = $f($password);
248		return $password;
249		}
250
251		/**
	240	/**
252	241	* R�p�tion de l'objet utilisateur.
253	242	*/

trunk/lib/jelix/auth/jAuthDriverClass.class.php

r214	r271
54	54	$user = jClasses::createRecord($this->_params['class']);
55	55	$user->login = $login;
56		$user->password = $~~password~~;
	56	$user->password = $this->cryptPassword($password);
57	57	return $user;
58	58	}
…	…
69	69	public function changePassword($login, $newpassword){
70	70	$class = jClasses::create($this->_params['class']);
71		return $class->updatePassword($login, $~~newpassword~~);
	71	return $class->updatePassword($login, $this->cryptPassword($newpassword));
72	72	}
73	73
…	…
75	75	$classuser = jClasses::create($this->_params['class']);
76	76
77		$user = $classuser->getByLoginPassword($login, $~~password~~);
	77	$user = $classuser->getByLoginPassword($login, $this->cryptPassword($password));
78	78
79	79	return ($user?$user:false);
80	80	}
81	81
	82	protected function cryptPassword($password){
	83	$f=$this->_params['password_crypt_function'];
	84	if( $f != '')
	85	$password = $f($password);
	86	return $password;
	87	}
82	88	}
83	89	?>

trunk/lib/jelix/auth/jAuthDriverDb.class.php

r248	r271
56	56	$user = jDao::createRecord($this->_params['dao']);
57	57	$user->login = $login;
58		$user->password = $~~password~~;
	58	$user->password = $this->cryptPassword($password);
59	59	return $user;
60	60	}
…	…
71	71	public function changePassword($login, $newpassword){
72	72	$dao = jDao::get($this->_params['dao']);
73		return $dao->updatePassword($login, $~~newpassword~~);
	73	return $dao->updatePassword($login, $this->cryptPassword($newpassword));
74	74	}
75	75
76	76	public function verifyPassword($login, $password){
77	77	$daouser = jDao::get($this->_params['dao']);
78		$user = $daouser->getByLoginPassword($login, $~~password~~);
	78	$user = $daouser->getByLoginPassword($login, $this->cryptPassword($password));
79	79	return ($user?$user:false);
80	80	}
81	81
	82
	83	protected function cryptPassword($password){
	84	$f=$this->_params['password_crypt_function'];
	85	if( $f != '')
	86	$password = $f($password);
	87	return $password;
	88	}
82	89	}
83	90	?>

trunk/lib/jelix/core/jErrorHandler.lib.php

r257	r271
106	106	}
107	107	if(strpos($action , 'LOGFILE') !== false){
108		error_log($messageLog,3, JELIX_APP_LOG_PATH.$conf['logFile']);
	108	@error_log($messageLog,3, JELIX_APP_LOG_PATH.$conf['logFile']);
109	109	}
110	110	if(strpos($action , 'MAIL') !== false){
…	…
116	116
117	117	if(strpos($action , 'EXIT') !== false){
118		if($doecho && $gJCoord->response)
	118	if($doecho && $gJCoord->response)
119	119	$gJCoord->response->outputErrors();
120	120	exit;

trunk/lib/jelix/core/response/jResponseHtml.class.php

r250	r271
131	131	echo '<div id="jelixerror" style="position:absolute;left:0px;top:0px;border:3px solid red; background-color:#f39999;color:black;">';
132	132	echo $this->getFormatedErrorMsg();
133		echo '<p><a href="#" onclick="document.getElementById(\'jelixerror\').style.display=\'none\';return false;">fermer</a></div>';
	133	echo '<p><a href="#" onclick="document.getElementById(\'jelixerror\').style.display=\'none\';return false;">fermer</a></p></div>';
134	134	}
135	135	echo implode("\n",$this->_bodyBottom);

trunk/Makefile

r268	r271
69	69	default:
70	70	@echo "target: "
71		@echo " dist-all dist-jelix dist-testapp dist-myapp dist-modules"
72		@echo " dev-all dev-jelix dev-jelix-lib dev-myapp dev-testapp dev-modules"
	71	@echo " dist-all dist-jelix dist-testapp dist-myapp dist-modules dist-demoxul"
	72	@echo " dev-all dev-jelix dev-jelix-lib dev-myapp dev-testapp dev-modules dev-demoxul"
73	73	@echo " jtpl jtpl-dist"
74	74	@echo " jbt-dist"
…	…
80	80	@echo " JTPL_VERSION : num� de version de jtpl standalone (" $(JTPL_VERSION) ")"
81	81	@echo "r�rtoire de construction des projets:"
82		@echo " distributions jelix testapp myapp : " $(DISTJELIX)
83		@echo " developpement jelix testapp myapp : " $(DISTHACKER)
	82	@echo " distributions jelix testapp myapp demoxul : " $(DISTJELIX)
	83	@echo " developpement jelix testapp myapp demoxul : " $(DISTHACKER)
84	84	@echo " distribution jtpl : " $(DISTJTPL)
85	85
…	…
99	99	$(PHP) build/mkdist.php build/manifests/testapp.mn . $(DISTJELIX)
100	100	tar czf $(DIST)/testapp-$(LIB_NAME).tar.gz -C $(DISTJELIX) testapp/ temp/testapp/
	101
	102	dist-demoxul: common-dist
	103	$(PHP) build/mkdist.php build/manifests/demoxul.mn . $(DISTJELIX)
	104	tar czf $(DIST)/demoxul-$(LIB_NAME).tar.gz -C $(DISTJELIX) demoxul/ temp/demoxul/
101	105
102	106	dist-myapp: common-dist
…	…
136	140	$(PHP) build/mkdist.php build/manifests/myapp.mn . $(DISTHACKER)
137	141
	142	dev-demoxul: common-dev
	143	$(PHP) build/mkdist.php build/manifests/demoxul.mn . $(DISTHACKER)
	144
138	145	common-dev:
139	146	if [ ! -d "$(DISTHACKER)" ] ; then mkdir $(DISTHACKER) ; fi

Download in other formats: Unified Diff Zip Archive

r89	r271
17	17
18	18	if($_SERVER['argc'] < 2){
	19	echo "too few arguments\n repertoire1 [repertoire2] fichier.mn";
19	20	exit(1);
20	21	}

Developers' Corner

Changeset 271

Legend: