Context Navigation

← Previous Change
Next Change →

thai2.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:

: 1 edited

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

Legend:

: Unmodified
: Added
: Removed

main/trunk/greenstone2/macros/thai2.dm

-              r18665
+              r28888
     (àžàž¶à¹àžà¹àžàž·à¹àžàž¡à¹àž¢àžà¹àžàž¢àž±àžàžàžàž¥à¹àž¥àžàžàž±àž "_2_")
     àžà¹àž²àžàžžàžàžà¹àžàžàžàž²àž£àžàž¹àžàž²àž£à¹àžàž·à¹àžàž¡à¹àž¢àžàžàžµà¹à¹àžàžàžàž¥à¹àž¥àžàžàž±àž "_2_" àžàžžàžàžªàž²àž¡àž²àž£àž
     <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">à¹àžàžà¹àžàž¢àž±àž</a> àž«àžà¹àž²àžàžµà¹à¹àžà¹
+    <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">à¹àžàžà¹àžàž¢àž±àž</a> àž«àžà¹àž²àžàžµà¹à¹àžà¹
     àž«àž£àž·àžà¹àžà¹àžàžžà¹àž¡ "àž¢à¹àžàžàžàž¥àž±àž" àžàžà¹àžàž£àž²àž§à¹àžàžàž£à¹àžàžàžàžàžžàžà¹àžàž·à¹àžàžàž¥àž±àžà¹àžà¹àžàžàžªàž²àž£àžà¹àžàžàž«àžà¹àž²àžàžµà¹
+}
 …
 _textpassword_ [l=th] {àž£àž«àž±àžªàžà¹àž²àž}
 _textmustbelongtogroup_ [l=th] {à¹àžàž£àžàžªàž±àžà¹àžàžàžžàž§à¹àž² àžàžžàžàžà¹àžàžàžàž¢àž¹à¹à¹àžàžàž¥àžžà¹àž¡ "_cgiargug_" à¹àžàž·à¹àžà¹àžà¹àž²àžàž¶àžàž«àžà¹àž²àžàžµà¹}
+_textmustbelongtogroup_ [l=th] {à¹àžàž£àžàžªàž±àžà¹àžàžàžžàž§à¹àž² àžàžžàžàžà¹àžàžàžàž¢àž¹à¹à¹àžàžàž¥àžžà¹àž¡ "_cgiargugHtmlsafe_" à¹àžàž·à¹àžà¹àžà¹àž²àžàž¶àžàž«àžà¹àž²àžàžµà¹}
 _textmessageinvalid_ [l=th] {àžàžžàžàžàž°àžà¹àžàžà¹àžà¹àž²àžªàž¹à¹àž£àž°àžàžàžà¹àžàžà¹àžàž¢àž±àžàž«àžà¹àž²àžàžµà¹àžàžžàžàž£à¹àžàžàžàž <br>
 …
 _textretcoll_ [l=th] {àžàž¥àž±àžà¹àžàž¢àž±àžàžàž±àž§àž£àž§àžàž£àž§àž¡}
 _textdelperm_ [l=th] {à¹àž¡à¹àžªàž²àž¡àž²àž£àžàž¥àžàžàžàž¥à¹àž¥àžàžàž±àž _cgiargbc1dirname_ àžàž²àžàžàž±àž§àž«àž£àž·àžàžàž±à¹àžàž«àž¡àžà¹àžà¹
+_textdelperm_ [l=th] {à¹àž¡à¹àžªàž²àž¡àž²àž£àžàž¥àžàžàžàž¥à¹àž¥àžàžàž±àž _cgiargbc1dirnameHtmlsafe_ àžàž²àžàžàž±àž§àž«àž£àž·àžàžàž±à¹àžàž«àž¡àžà¹àžà¹
 àžªàž²à¹àž«àžàžžàžàžµà¹àžàž²àžà¹àžà¹àžà¹àžà¹àž¡àžµàžàž±àžàžàžµà¹:
 <ul>
 <li> à¹àžàž£à¹àžàž£àž¡ Greenstone à¹àž¡à¹à¹àžà¹àž£àž±àžàžàžàžžàžàž²àžà¹àž«à¹àž¥àžà¹àžà¹àž£àžàžàžàž£àžµ _gsdlhome_/collect/_cgiargbc1dirname_<br>
 àžàžžàžàžàž²àžàžàž³à¹àžà¹àžàžà¹àžàžàž¥àžà¹àžà¹àž£àžàžàžàž£àžµàžàžµà¹àžàžàžàžà¹àž§àž¢àžàžà¹àžàž à¹àžàž·à¹àžàžà¹àž§àž¢à¹àž«à¹àžàž²àž£àž¥àžàžàžàž¥à¹àž¥àžàžàž±àž _cgiargbc1dirname_ àžàžàžàžàž²àžàžàžàž¡àžàžŽàž§à¹àžàžàž£à¹àžàžµà¹à¹àžªàž£à¹àžàžªàž¡àžàž¹àž£àžà¹</li>
+<li> à¹àžàž£à¹àžàž£àž¡ Greenstone à¹àž¡à¹à¹àžà¹àž£àž±àžàžàžàžžàžàž²àžà¹àž«à¹àž¥àžà¹àžà¹àž£àžàžàžàž£àžµ _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_<br>
+àžàžžàžàžàž²àžàžàž³à¹àžà¹àžàžà¹àžàžàž¥àžà¹àžà¹àž£àžàžàžàž£àžµàžàžµà¹àžàžàžàžà¹àž§àž¢àžàžà¹àžàž à¹àžàž·à¹àžàžà¹àž§àž¢à¹àž«à¹àžàž²àž£àž¥àžàžàžàž¥à¹àž¥àžàžàž±àž _cgiargbc1dirnameHtmlsafe_ àžàžàžàžàž²àžàžàžàž¡àžàžŽàž§à¹àžàžàž£à¹àžàžµà¹à¹àžªàž£à¹àžàžªàž¡àžàž¹àž£àžà¹</li>
 <li>à¹àžàž£à¹àžàž£àž¡ Greenstone à¹àž¡à¹àžªàž²àž¡àž²àž£àžà¹àž£àžµàž¢àžà¹àžà¹à¹àžàž£à¹àžàž£àž¡ _gsdlhome_/bin/script/delcol.pl à¹àžà¹ àžàž£àžžàžàž²àžàž£àž§àžàžªàžàžà¹àž«à¹à¹àžà¹à¹àžàž§à¹àž² à¹àžà¹àž¡àžàžµà¹àžªàž²àž¡àž²àž£àžàžà¹àž²àžà¹àž¥àž°àžàžàžŽàžàž±àžàžŽàžàž²àž£à¹àžà¹</li>
 </ul>
+}
 _textdelinv_ [l=th] {àžàžàž¥à¹àž¥àžàžàž±àž _cgiargbc1dirname_ à¹àžà¹àž£àž±àžàžàž²àž£àžà¹àžàžàžàž±àžàž«àž£àž·àžà¹àž¡à¹àžàž¹àžàžà¹àžàž  àžàž²àž£àž¥àžàžàž¹àžàž¢àžà¹àž¥àžŽàž}
 _textdelsuc_ [l=th] {àžàžàž¥à¹àž¥àžàžàž±àž _cgiargbc1dirname_ àžàž¹àžàž¥àžà¹àž£àžµàž¢àžàž£à¹àžàž¢à¹àž¥à¹àž§}
 _textclonefail_ [l=th] {à¹àž¡à¹àžªàž²àž¡àž²àž£àžàž¥àžàžà¹àžàžàžàžàž¥à¹àž¥àžàžàž±àž _cgiargclonecol_ collection à¹àžà¹  àžªàž²à¹àž«àžàžžàžàžµà¹à¹àžà¹àžà¹àžà¹àžà¹à¹àžàžŽàžàžàž²àž:
+_textdelinv_ [l=th] {àžàžàž¥à¹àž¥àžàžàž±àž _cgiargbc1dirnameHtmlsafe_ à¹àžà¹àž£àž±àžàžàž²àž£àžà¹àžàžàžàž±àžàž«àž£àž·àžà¹àž¡à¹àžàž¹àžàžà¹àžàž  àžàž²àž£àž¥àžàžàž¹àžàž¢àžà¹àž¥àžŽàž}
+_textdelsuc_ [l=th] {àžàžàž¥à¹àž¥àžàžàž±àž _cgiargbc1dirnameHtmlsafe_ àžàž¹àžàž¥àžà¹àž£àžµàž¢àžàž£à¹àžàž¢à¹àž¥à¹àž§}
+_textclonefail_ [l=th] {à¹àž¡à¹àžªàž²àž¡àž²àž£àžàž¥àžàžà¹àžàžàžàžàž¥à¹àž¥àžàžàž±àž _cgiargclonecolHtmlsafe_ collection à¹àžà¹  àžªàž²à¹àž«àžàžžàžàžµà¹à¹àžà¹àžà¹àžà¹àžà¹à¹àžàžŽàžàžàž²àž:
 <ul>
 <li> à¹àž¡à¹àž¡àžµàžàžàž¥à¹àž¥àžàžàž±àž _cgiargclonecol_ àžàž¢àž¹à¹
 <li> àžàžàž¥à¹àž¥àžàžàž±àž _cgiargclonecol_ à¹àž¡à¹àž¡àžµà¹àžà¹àž¡àžàž³àž«àžàžàžà¹àž² collect.cfg
+<li> à¹àž¡à¹àž¡àžµàžàžàž¥à¹àž¥àžàžàž±àž _cgiargclonecolHtmlsafe_ àžàž¢àž¹à¹
+<li> àžàžàž¥à¹àž¥àžàžàž±àž _cgiargclonecolHtmlsafe_ à¹àž¡à¹àž¡àžµà¹àžà¹àž¡àžàž³àž«àžàžàžà¹àž² collect.cfg
 <li> à¹àžàž£à¹àžàž£àž¡Greenstone à¹àž¡à¹à¹àžà¹àž£àž±àžàžàžàžžàžàž²àžà¹àž«à¹àžà¹àž²àžà¹àžà¹àž¡àžàž³àž«àžàžàžà¹àž² collect.cfg
 </ul>
 …
 àžàžàž°àžªàž£à¹àž²àžàžàžàž¥à¹àž¥àžàžàž±àžàžà¹àž§àž¢àžàž±àž§àž£àž§àžàž£àž§àž¡)  àžàžà¹àžàž°àžàž³à¹àž«à¹àžàžžàžà¹àž£àžŽà¹àž¡àžà¹àžàžàž±àž§àž£àž§àžàž£àž§àž¡à¹àž«àž¡à¹àžàž±à¹àžà¹àžà¹à¹àž£àž}
 _textexptsuc_ [l=th] {àžàžàž¥à¹àž¥àžàžàž±àž _cgiargbc1dirname_ collection à¹àžà¹àž£àž±àžàžàž²àž£àžªà¹àžàžàžàžà¹àžàž¢àž±àžà¹àžà¹àž£àžàžàžàž£àžµ
 _gsdlhome_/tmp/exported\__cgiargbc1dirname_ à¹àž£àžµàž¢àžàž£à¹àžàž¢à¹àž¥à¹àž§
+}
 _textexptfail_ [l=th] {<p>à¹àž¡à¹àžªàž²àž¡àž²àž£àžàžªà¹àžàžàžàžàžàžàž¥à¹àž¥àžàžàž±àž _cgiargbc1dirname_ à¹àžà¹
+_textexptsuc_ [l=th] {àžàžàž¥à¹àž¥àžàžàž±àž _cgiargbc1dirnameHtmlsafe_ collection à¹àžà¹àž£àž±àžàžàž²àž£àžªà¹àžàžàžàžà¹àžàž¢àž±àžà¹àžà¹àž£àžàžàžàž£àžµ
+_gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ à¹àž£àžµàž¢àžàž£à¹àžàž¢à¹àž¥à¹àž§
+}
+_textexptfail_ [l=th] {<p>à¹àž¡à¹àžªàž²àž¡àž²àž£àžàžªà¹àžàžàžàžàžàžàž¥à¹àž¥àžàžàž±àž _cgiargbc1dirnameHtmlsafe_ à¹àžà¹
 <p>àžàž±à¹àžàžàžµà¹àžàž²àžàžàž°à¹àžàžŽàžàžàž²àžàžàž²àž£àžàžŽàžàžàž±à¹àžà¹àžàž£à¹àžàž£àž¡ Greenstone à¹àžàž¢à¹àž¡à¹à¹àžà¹àžàžŽàžàžàž±à¹àžàžàžàž¡à¹àžà¹àžàžàžà¹àžàžµà¹àžàž³à¹àžà¹àž
 …
 _textdeleteuser_ [l=th] {àž¥àžàžàž¹à¹à¹àžà¹}
 _textremwarn_ [l=th] {àžàžžàžàžà¹àžàžàžàž²àž£àž¥àžàžàž¹à¹à¹àžà¹ <b>_cgiargumun_</b> àžàžàžàžàž¢à¹àž²àžàžàž²àž§àž£àž«àž£àž·àžà¹àž¡à¹}
+_textremwarn_ [l=th] {àžàžžàžàžà¹àžàžàžàž²àž£àž¥àžàžàž¹à¹à¹àžà¹ <b>_cgiargumunHtmlsafe_</b> àžàžàžàžàž¢à¹àž²àžàžàž²àž§àž£àž«àž£àž·àžà¹àž¡à¹}

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

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

Legend:

main/trunk/greenstone2/macros/thai2.dm

Download in other formats: