- Timestamp:
- Jun 7, 2011, 12:23:31 PM (13 years ago)
- Location:
- trunk/server/common
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/server/common/oursrc/execsys/mime.types
r1784 r1877 509 509 application/xaml+xml xaml 510 510 application/x-silverlight-app xap 511 # The following MS Office MIME types are from this source: 512 # http://blogs.msdn.com/b/vsofficedeveloper/archive/2008/05/08/office-2007-open-xml-mime-types.aspx 513 # There's a typo in .potm that's corrected in this alternate source: 514 # http://therightstuff.de/2006/12/16/Office+2007+File+Icons+For+Windows+SharePoint+Services+20+And+SharePoint+Portal+Server+2003.aspx 515 application/msword dot 516 application/vnd.openxmlformats-officedocument.wordprocessingml.document docx 517 application/vnd.openxmlformats-officedocument.wordprocessingml.template dotx 518 application/vnd.ms-word.document.macroEnabled.12 docm 519 application/vnd.ms-word.template.macroEnabled.12 dotm 520 application/vnd.ms-excel xlt 521 application/vnd.ms-excel xla 522 application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx 523 application/vnd.openxmlformats-officedocument.spreadsheetml.template xltx 524 application/vnd.ms-excel.sheet.macroEnabled.12 xlsm 525 application/vnd.ms-excel.template.macroEnabled.12 xltm 526 application/vnd.ms-excel.addin.macroEnabled.12 xlam 527 application/vnd.ms-excel.sheet.binary.macroEnabled.12 xlsb 528 application/vnd.ms-powerpoint pot 529 application/vnd.ms-powerpoint pps 530 application/vnd.ms-powerpoint ppa 531 application/vnd.openxmlformats-officedocument.presentationml.presentation pptx 532 application/vnd.openxmlformats-officedocument.presentationml.template potx 533 application/vnd.openxmlformats-officedocument.presentationml.slideshow ppsx 534 application/vnd.ms-powerpoint.addin.macroEnabled.12 ppam 535 application/vnd.ms-powerpoint.presentation.macroEnabled.12 pptm 536 application/vnd.ms-powerpoint.template.macroEnabled.12 potm 537 application/vnd.ms-powerpoint.slideshow.macroEnabled.12 ppsm 538 # End MS Office MIME types. -
trunk/server/common/oursrc/execsys/upd-execsys
r1784 r1877 53 53 xls 54 54 ppt 55 dot 56 docx 57 dotx 58 docm 59 dotm 60 xlt 61 xla 62 xlsx 63 xltx 64 xlsm 65 xltm 66 xlam 67 xlsb 68 pot 69 pps 70 ppa 71 pptx 72 potx 73 ppsx 74 ppam 75 pptm 76 potm 77 ppsm 55 78 swf 56 79 mp3 … … 70 93 ttf 71 94 otf 95 odc 96 odb 97 odf 98 odg 99 otg 100 odi 101 odp 102 otp 103 ods 104 ots 105 odt 106 odm 107 ott 108 oth 72 109 ); 73 110 -
trunk/server/common/oursrc/scripts-static-cat/StaticCat.hs
r1784 r1877 35 35 (".css", "text/css"), 36 36 (".doc", "application/msword"), 37 (".docm", "application/vnd.ms-word.document.macroEnabled.12"), 38 (".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document"), 39 (".dot", "application/msword"), 40 (".dotm", "application/vnd.ms-word.template.macroEnabled.12"), 41 (".dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template"), 37 42 (".gif", "image/gif"), 38 43 (".htm", "text/html"), … … 50 55 (".mpeg", "video/mpeg"), 51 56 (".mpg", "video/mpeg"), 57 (".odb", "application/vnd.oasis.opendocument.database"), 58 (".odc", "application/vnd.oasis.opendocument.chart"), 59 (".odf", "application/vnd.oasis.opendocument.formula"), 60 (".odg", "application/vnd.oasis.opendocument.graphics"), 61 (".odi", "application/vnd.oasis.opendocument.image"), 62 (".odm", "application/vnd.oasis.opendocument.text-master"), 63 (".odp", "application/vnd.oasis.opendocument.presentation"), 64 (".ods", "application/vnd.oasis.opendocument.spreadsheet"), 65 (".odt", "application/vnd.oasis.opendocument.text"), 52 66 (".otf", "application/octet-stream"), 67 (".otg", "application/vnd.oasis.opendocument.graphics-template"), 68 (".oth", "application/vnd.oasis.opendocument.text-web"), 69 (".otp", "application/vnd.oasis.opendocument.presentation-template"), 70 (".ots", "application/vnd.oasis.opendocument.spreadsheet-template"), 71 (".ott", "application/vnd.oasis.opendocument.text-template"), 53 72 (".pdf", "application/pdf"), 54 73 (".png", "image/png"), 74 (".pot", "application/vnd.ms-powerpoint"), 75 (".potm", "application/vnd.ms-powerpoint.template.macroEnabled.12"), 76 (".potx", "application/vnd.openxmlformats-officedocument.presentationml.template"), 77 (".ppa", "application/vnd.ms-powerpoint"), 78 (".ppam", "application/vnd.ms-powerpoint.addin.macroEnabled.12"), 79 (".pps", "application/vnd.ms-powerpoint"), 80 (".ppsm", "application/vnd.ms-powerpoint.slideshow.macroEnabled.12"), 81 (".ppsx", "application/vnd.openxmlformats-officedocument.presentationml.slideshow"), 55 82 (".ppt", "application/vnd.ms-powerpoint"), 83 (".pptm", "application/vnd.ms-powerpoint.presentation.macroEnabled.12"), 84 (".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation"), 56 85 (".ps", "application/postscript"), 57 86 (".svg", "image/svg+xml"), … … 67 96 (".xap", "application/x-silverlight-app"), 68 97 (".xhtml", "application/xhtml+xml"), 98 (".xla", "application/vnd.ms-excel"), 99 (".xlam", "application/vnd.ms-excel.addin.macroEnabled.12"), 69 100 (".xls", "application/vnd.ms-excel"), 101 (".xlsb", "application/vnd.ms-excel.sheet.binary.macroEnabled.12"), 102 (".xlsm", "application/vnd.ms-excel.sheet.macroEnabled.12"), 103 (".xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"), 104 (".xlt", "application/vnd.ms-excel"), 105 (".xltm", "application/vnd.ms-excel.template.macroEnabled.12"), 106 (".xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template"), 70 107 (".xml", "text/xml"), 71 108 (".xsl", "text/xml"), -
trunk/server/common/patches/httpd-suexec-scripts.patch
r1785 r1877 73 73 74 74 /* variable name is */ 75 @@ -245,9 +250, 71@@75 @@ -245,9 +250,108 @@ 76 76 environ = cleanenv; 77 77 } … … 100 100 + "xls", 101 101 + "ppt", 102 + "dot", 103 + "docx", 104 + "dotx", 105 + "docm", 106 + "dotm", 107 + "xlt", 108 + "xla", 109 + "xlsx", 110 + "xltx", 111 + "xlsm", 112 + "xltm", 113 + "xlam", 114 + "xlsb", 115 + "pot", 116 + "pps", 117 + "ppa", 118 + "pptx", 119 + "potx", 120 + "ppsx", 121 + "ppam", 122 + "pptm", 123 + "potm", 124 + "ppsm", 102 125 + "swf", 103 126 + "mp3", … … 117 140 + "ttf", 118 141 + "otf", 142 + "odc", 143 + "odb", 144 + "odf", 145 + "odg", 146 + "otg", 147 + "odi", 148 + "odp", 149 + "otp", 150 + "ods", 151 + "ots", 152 + "odt", 153 + "odm", 154 + "ott", 155 + "oth", 119 156 + NULL 120 157 +}; … … 145 182 gid_t gid; /* target group placeholder */ 146 183 char *target_uname; /* target user name */ 147 @@ -268,6 +3 31,7 @@184 @@ -268,6 +368,7 @@ 148 185 * Start with a "clean" environment 149 186 */ … … 153 190 prog = argv[0]; 154 191 /* 155 @@ -350,6 +4 14,20 @@192 @@ -350,6 +451,20 @@ 156 193 #endif /*_OSD_POSIX*/ 157 194 … … 174 211 * or attempts to back up out of the current directory, 175 212 * to protect against attacks. If any are 176 @@ -371,6 +4 49,7 @@213 @@ -371,6 +486,7 @@ 177 214 userdir = 1; 178 215 } … … 182 219 * Error out if the target username is invalid. 183 220 */ 184 @@ -452,7 +5 31,7 @@221 @@ -452,7 +568,7 @@ 185 222 * Error out if attempt is made to execute as root or as 186 223 * a UID less than AP_UID_MIN. Tsk tsk. … … 191 228 exit(107); 192 229 } 193 @@ -484,6 +5 63,7 @@230 @@ -484,6 +599,7 @@ 194 231 log_err("failed to setuid (%ld: %s)\n", uid, cmd); 195 232 exit(110); … … 199 236 /* 200 237 * Get the current working directory, as well as the proper 201 @@ -506,6 +6 00,21 @@238 @@ -506,6 +637,21 @@ 202 239 log_err("cannot get docroot information (%s)\n", target_homedir); 203 240 exit(112); … … 221 258 else { 222 259 if (((chdir(AP_DOC_ROOT)) != 0) || 223 @@ -532,15 +6 41,17 @@260 @@ -532,15 +678,17 @@ 224 261 /* 225 262 * Error out if cwd is writable by others. … … 240 277 exit(117); 241 278 } 242 @@ -548,10 +6 59,12 @@279 @@ -548,10 +696,12 @@ 243 280 /* 244 281 * Error out if the program is writable by others. … … 253 290 /* 254 291 * Error out if the file is setuid or setgid. 255 @@ -565,6 + 678,7 @@292 @@ -565,6 +715,7 @@ 256 293 * Error out if the target name/group is different from 257 294 * the name/group of the cwd or the program. … … 261 298 (gid != dir_info.st_gid) || 262 299 (uid != prg_info.st_uid) || 263 @@ -576,12 + 690,14 @@300 @@ -576,12 +727,14 @@ 264 301 prg_info.st_uid, prg_info.st_gid); 265 302 exit(120); … … 277 314 exit(121); 278 315 } 279 @@ -614,6 +7 30,23 @@316 @@ -614,6 +767,23 @@ 280 317 /* 281 318 * Execute the command, replacing our image with its own.
Note: See TracChangeset
for help on using the changeset viewer.