Changeset 28888 for main/trunk/greenstone2/macros/chinese2.dm

Timestamp:

2014-03-13T14:34:48+13:00 (10 years ago)

Author:

ak19

Message:

First security commit. 1. Introducing the new securitools.h and .cpp files, which port the functions necessary to implement security in Greenstone from OWASP-ESAPI for Java, since OWASP's C++ version is largely not yet implemented, even though their code compiles. The newly added runtime-src/packages/security which contains OWASP ESAPI for C++ will therefore be removed again shortly. 2. receptionist.cpp now sets various web-encoded variants for each cgiarg macro, such as HTML entity encoded, attr encoded, javascript encoded (and css encoded variants). These are now used in the macro files based on which variant is suited to the context. 3. This commit further contains the minimum changes to protect the c, d, and p cgi variables.

File:

• main/trunk/greenstone2/macros/chinese2.dm (modified) (5 diffs)

main/trunk/greenstone2/macros/chinese2.dm

@@ -152 +152 @@
 _foundintcontent_ [l=zh] {<h3>连接到收藏“_2_”</h3>
 
-<p>悚选择的铟接是到收藏“_collectionname_”的䞀䞪倖郚铟接它是连接到收藏“_2_”。劂果悚想查看圚收藏“_2_”的这䞪铟接悚可以<a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">前进</a> 到这䞪页面吊则甚悚的浏览噚的“返回”按钮退回到之前的文件。}  
+<p>悚选择的铟接是到收藏“_collectionname_”的䞀䞪倖郚铟接它是连接到收藏“_2_”。劂果悚想查看圚收藏“_2_”的这䞪铟接悚可以<a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">前进</a> 到这䞪页面吊则甚悚的浏览噚的“返回”按钮退回到之前的文件。}  
 
 
@@ -171 +171 @@
 
 _textmustbelongtogroup_ [l=zh] {泚意悚å¿
-须是属于“_cgiargug_”组才胜访问歀页面}  
+须是属于“_cgiargugHtmlsafe_”组才胜访问歀页面}  
 
 _textmessageinvalid_ [l=zh] {<br>)
@@ -479 +479 @@
 }  
 
-_textdelperm_ [l=zh] {收藏_cgiargbc1dirname_的郚仜或è€
+_textdelperm_ [l=zh] {收藏_cgiargbc1dirnameHtmlsafe_的郚仜或è€
 å
 šéƒšäžèƒœè¢«åˆ é™€ã€‚åŽŸå› å¯èƒœæœ‰ïŒš
 <ul>
-<li>ç»¿å®çŸ³ç³»ç»Ÿæ²¡æœ‰æƒé™æ¥åˆ é™€_gsdlhome_/collect/_cgiargbc1dirname_目圕。<br>
-悚可胜需芁手劚移陀这䞪目圕来完成收藏_cgiargbc1dirname_从这郚电脑䞭的移陀。</li>
+<li>ç»¿å®çŸ³ç³»ç»Ÿæ²¡æœ‰æƒé™æ¥åˆ é™€_gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_目圕。<br>
+悚可胜需芁手劚移陀这䞪目圕来完成收藏_cgiargbc1dirnameHtmlsafe_从这郚电脑䞭的移陀。</li>
 <li>绿宝石系统䞍胜运行皋序_gsdlhome_/bin/script/delcol.pl。请确定这䞪档案是可读取和可执行的。</li>
 </ul>}  
 
-_textdelinv_ [l=zh] {收藏_cgiargbc1dirname_是被保技的或è€
+_textdelinv_ [l=zh] {收藏_cgiargbc1dirnameHtmlsafe_是被保技的或è€
 æ— æ•ˆçš„ã€‚åˆ é™€å·²è¢«å–æ¶ˆã€‚}  
 
-_textdelsuc_ [l=zh] {_cgiargbc1dirname_ æ”¶è—å·²ç»è¢«æˆåŠŸåœ°åˆ é™€ã€‚}  
-
-_textclonefail_ [l=zh] {收藏_cgiargclonecol_äžèƒœè¢«å€åˆ¶çš„ã€‚åŽŸå› å¯èƒœæœ‰ïŒš
+_textdelsuc_ [l=zh] {_cgiargbc1dirnameHtmlsafe_ æ”¶è—å·²ç»è¢«æˆåŠŸåœ°åˆ é™€ã€‚}  
+
+_textclonefail_ [l=zh] {收藏_cgiargclonecolHtmlsafe_äžèƒœè¢«å€åˆ¶çš„ã€‚åŽŸå› å¯èƒœæœ‰ïŒš
 <ul>
-<li>歀收藏_cgiargclonecol_䞍存圚
-<li>歀收藏_cgiargclonecol_没有é
+<li>歀收藏_cgiargclonecolHtmlsafe_䞍存圚
+<li>歀收藏_cgiargclonecolHtmlsafe_没有é
 çœ®æ¡£æ¡ˆcollect.cfg
 <li>绿宝石系统没有权限来读取é
@@ -531 +531 @@
 。}  
 
-_textexptsuc_ [l=zh] {收藏_cgiargbc1dirname_已被成功地富出到_gsdlhome_/tmp/exported\__cgiargbc1dirname_目圕䞋。}  
-
-_textexptfail_ [l=zh] {<p>富出銆藏_cgiargbc1dirname_倱莥。
+_textexptsuc_ [l=zh] {收藏_cgiargbc1dirnameHtmlsafe_已被成功地富出到_gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_目圕䞋。}  
+
+_textexptfail_ [l=zh] {<p>富出銆藏_cgiargbc1dirnameHtmlsafe_倱莥。
 
 <p>è¿™åŸˆå¯èƒœæ˜¯å› äžºç»¿å®çŸ³åœšå®‰è£
@@ -752 +752 @@
 _textdeleteuser_ [l=zh] {åˆ é™€äž€äžªç”šæˆ·}  
 _textremwarn_ [l=zh] {悚真的想氞ä¹
-地移陀甚户<b>_cgiargumun_</b>吗}  
+地移陀甚户<b>_cgiargumunHtmlsafe_</b>吗}