|
222 | 222 | 'ajax_combined_message_list' |
223 | 223 | ), |
224 | 224 | 'allowed_output' => array( |
225 | | - 'date' => array(FILTER_DEFAULT, false), |
| 225 | + 'date' => array(FILTER_UNSAFE_RAW, false), |
226 | 226 | 'formatted_folder_list' => array(FILTER_UNSAFE_RAW, false), |
227 | | - 'router_user_msgs' => array(FILTER_DEFAULT, FILTER_REQUIRE_ARRAY), |
| 227 | + 'router_user_msgs' => array(FILTER_UNSAFE_RAW, FILTER_REQUIRE_ARRAY), |
228 | 228 | 'router_login_state' => array(FILTER_VALIDATE_BOOLEAN, false), |
229 | 229 | 'formatted_message_list' => array(FILTER_UNSAFE_RAW, FILTER_REQUIRE_ARRAY), |
230 | 230 | 'just_saved_credentials' => array(FILTER_VALIDATE_BOOLEAN, false), |
231 | 231 | 'just_forgot_credentials' => array(FILTER_VALIDATE_BOOLEAN, false), |
232 | | - 'deleted_server_id' => array(FILTER_DEFAULT, false), |
| 232 | + 'deleted_server_id' => array(FILTER_UNSAFE_RAW, false), |
233 | 233 | 'msg_headers' => array(FILTER_UNSAFE_RAW, false), |
234 | 234 | 'msg_text' => array(FILTER_UNSAFE_RAW, false), |
235 | 235 | 'msg_source' => array(FILTER_UNSAFE_RAW, false), |
236 | 236 | 'msg_parts' => array(FILTER_UNSAFE_RAW, false), |
237 | 237 | 'pages' => array(FILTER_VALIDATE_INT, false), |
238 | | - 'folder_status' => array(FILTER_DEFAULT, FILTER_REQUIRE_ARRAY), |
239 | | - 'imap_server_id' => array(FILTER_DEFAULT, false), |
240 | | - 'imap_service_name' => array(FILTER_DEFAULT, false) |
| 238 | + 'folder_status' => array(FILTER_UNSAFE_RAW, FILTER_REQUIRE_ARRAY), |
| 239 | + 'imap_server_id' => array(FILTER_UNSAFE_RAW, false), |
| 240 | + 'imap_service_name' => array(FILTER_UNSAFE_RAW, false) |
241 | 241 | ), |
242 | 242 | 'allowed_cookie' => array( |
243 | | - 'CYPHTID' => FILTER_DEFAULT, |
244 | | - 'hm_id' => FILTER_DEFAULT, |
245 | | - 'hm_session' => FILTER_DEFAULT, |
246 | | - 'hm_msgs' => FILTER_DEFAULT, |
| 243 | + 'CYPHTID' => FILTER_UNSAFE_RAW, |
| 244 | + 'hm_id' => FILTER_UNSAFE_RAW, |
| 245 | + 'hm_session' => FILTER_UNSAFE_RAW, |
| 246 | + 'hm_msgs' => FILTER_UNSAFE_RAW, |
247 | 247 | 'hm_reload_folders' => FILTER_VALIDATE_INT |
248 | 248 | ), |
249 | 249 | 'allowed_server' => array( |
250 | | - 'REQUEST_URI' => FILTER_DEFAULT, |
251 | | - 'REQUEST_METHOD' => FILTER_DEFAULT, |
| 250 | + 'REQUEST_URI' => FILTER_UNSAFE_RAW, |
| 251 | + 'REQUEST_METHOD' => FILTER_UNSAFE_RAW, |
252 | 252 | 'SERVER_ADDR' => FILTER_VALIDATE_IP, |
253 | 253 | 'REMOTE_ADDR' => FILTER_VALIDATE_IP, |
254 | 254 | 'SERVER_PORT' => FILTER_VALIDATE_INT, |
255 | | - 'SERVER_PROTOCOL' => FILTER_DEFAULT, |
256 | | - 'PHP_SELF' => FILTER_DEFAULT, |
257 | | - 'REQUEST_SCHEME' => FILTER_DEFAULT, |
258 | | - 'HTTP_HOST' => FILTER_DEFAULT, |
| 255 | + 'SERVER_PROTOCOL' => FILTER_UNSAFE_RAW, |
| 256 | + 'PHP_SELF' => FILTER_UNSAFE_RAW, |
| 257 | + 'REQUEST_SCHEME' => FILTER_UNSAFE_RAW, |
| 258 | + 'HTTP_HOST' => FILTER_UNSAFE_RAW, |
259 | 259 | 'HTTP_ORIGIN' => FILTER_VALIDATE_URL, |
260 | 260 | 'HTTP_REFERER' => FILTER_VALIDATE_URL, |
261 | | - 'HTTP_ACCEPT_LANGUAGE' => FILTER_DEFAULT, |
262 | | - 'HTTP_ACCEPT_ENCODING' => FILTER_DEFAULT, |
263 | | - 'HTTP_ACCEPT_CHARSET' => FILTER_DEFAULT, |
264 | | - 'HTTP_ACCEPT' => FILTER_DEFAULT, |
265 | | - 'HTTP_USER_AGENT' => FILTER_DEFAULT, |
266 | | - 'HTTPS' => FILTER_DEFAULT, |
267 | | - 'SERVER_NAME' => FILTER_DEFAULT, |
268 | | - 'HTTP_X_REQUESTED_WITH' => FILTER_DEFAULT, |
269 | | - 'HTTP_X_FORWARDED_HOST' => FILTER_DEFAULT |
| 261 | + 'HTTP_ACCEPT_LANGUAGE' => FILTER_UNSAFE_RAW, |
| 262 | + 'HTTP_ACCEPT_ENCODING' => FILTER_UNSAFE_RAW, |
| 263 | + 'HTTP_ACCEPT_CHARSET' => FILTER_UNSAFE_RAW, |
| 264 | + 'HTTP_ACCEPT' => FILTER_UNSAFE_RAW, |
| 265 | + 'HTTP_USER_AGENT' => FILTER_UNSAFE_RAW, |
| 266 | + 'HTTPS' => FILTER_UNSAFE_RAW, |
| 267 | + 'SERVER_NAME' => FILTER_UNSAFE_RAW, |
| 268 | + 'HTTP_X_REQUESTED_WITH' => FILTER_UNSAFE_RAW, |
| 269 | + 'HTTP_X_FORWARDED_HOST' => FILTER_UNSAFE_RAW |
270 | 270 | ), |
271 | 271 |
|
272 | 272 | 'allowed_get' => array( |
273 | | - 'page' => FILTER_DEFAULT, |
274 | | - 'msgs' => FILTER_DEFAULT, |
275 | | - 'list_path' => FILTER_DEFAULT, |
276 | | - 'list_parent' => FILTER_DEFAULT, |
| 273 | + 'page' => FILTER_SANITIZE_FULL_SPECIAL_CHARS, |
| 274 | + 'msgs' => FILTER_SANITIZE_FULL_SPECIAL_CHARS, |
| 275 | + 'list_path' => FILTER_SANITIZE_FULL_SPECIAL_CHARS, |
| 276 | + 'list_parent' => FILTER_SANITIZE_FULL_SPECIAL_CHARS, |
277 | 277 | 'list_page' => FILTER_VALIDATE_INT, |
278 | | - 'uid' => FILTER_DEFAULT, |
| 278 | + 'uid' => FILTER_SANITIZE_FULL_SPECIAL_CHARS, |
279 | 279 | 'search_terms' => FILTER_UNSAFE_RAW, |
280 | | - 'search_since' => FILTER_DEFAULT, |
281 | | - 'search_fld' => FILTER_DEFAULT, |
282 | | - 'filter' => FILTER_DEFAULT, |
283 | | - 'sort' => FILTER_DEFAULT, |
284 | | - 'keyword' => FILTER_DEFAULT, |
285 | | - 'screen_emails' => FILTER_DEFAULT, |
| 280 | + 'search_since' => FILTER_SANITIZE_FULL_SPECIAL_CHARS, |
| 281 | + 'search_fld' => FILTER_SANITIZE_FULL_SPECIAL_CHARS, |
| 282 | + 'filter' => FILTER_SANITIZE_FULL_SPECIAL_CHARS, |
| 283 | + 'sort' => FILTER_SANITIZE_FULL_SPECIAL_CHARS, |
| 284 | + 'keyword' => FILTER_SANITIZE_FULL_SPECIAL_CHARS, |
| 285 | + 'screen_emails' => FILTER_SANITIZE_FULL_SPECIAL_CHARS, |
286 | 286 | ), |
287 | 287 |
|
288 | 288 | 'allowed_post' => array( |
289 | | - 'payload' => FILTER_DEFAULT, |
290 | | - 'reset_factory' => FILTER_DEFAULT, |
291 | | - 'hm_page_key' => FILTER_DEFAULT, |
| 289 | + 'payload' => FILTER_UNSAFE_RAW, |
| 290 | + 'reset_factory' => FILTER_UNSAFE_RAW, |
| 291 | + 'hm_page_key' => FILTER_UNSAFE_RAW, |
292 | 292 | 'logout' => FILTER_VALIDATE_BOOLEAN, |
293 | 293 | 'save_and_logout' => FILTER_VALIDATE_BOOLEAN, |
294 | 294 | 'limit' => FILTER_VALIDATE_INT, |
295 | | - 'username' => FILTER_DEFAULT, |
| 295 | + 'username' => FILTER_UNSAFE_RAW, |
296 | 296 | 'show_list_icons' => FILTER_VALIDATE_BOOLEAN, |
297 | 297 | 'password' => FILTER_UNSAFE_RAW, |
298 | | - 'hm_ajax_hook' => FILTER_DEFAULT, |
299 | | - 'save_settings' => FILTER_DEFAULT, |
300 | | - 'save_settings_permanently' => FILTER_DEFAULT, |
301 | | - 'save_settings_permanently_then_logout' => FILTER_DEFAULT, |
302 | | - 'language' => FILTER_DEFAULT, |
| 298 | + 'hm_ajax_hook' => FILTER_UNSAFE_RAW, |
| 299 | + 'save_settings' => FILTER_UNSAFE_RAW, |
| 300 | + 'save_settings_permanently' => FILTER_UNSAFE_RAW, |
| 301 | + 'save_settings_permanently_then_logout' => FILTER_UNSAFE_RAW, |
| 302 | + 'language' => FILTER_UNSAFE_RAW, |
303 | 303 | 'flagged_per_source' => FILTER_VALIDATE_INT, |
304 | | - 'flagged_since' => FILTER_DEFAULT, |
| 304 | + 'flagged_since' => FILTER_UNSAFE_RAW, |
305 | 305 | 'unread_per_source' => FILTER_VALIDATE_INT, |
306 | | - 'unread_since' => FILTER_DEFAULT, |
| 306 | + 'unread_since' => FILTER_UNSAFE_RAW, |
307 | 307 | 'all_email_per_source' => FILTER_VALIDATE_INT, |
308 | | - 'all_email_since' => FILTER_DEFAULT, |
| 308 | + 'all_email_since' => FILTER_UNSAFE_RAW, |
309 | 309 | 'all_per_source' => FILTER_VALIDATE_INT, |
310 | | - 'all_since' => FILTER_DEFAULT, |
| 310 | + 'all_since' => FILTER_UNSAFE_RAW, |
311 | 311 | 'no_folder_icons' => FILTER_VALIDATE_BOOLEAN, |
312 | 312 | 'mailto_handler' => FILTER_VALIDATE_BOOLEAN, |
313 | | - 'list_style' => FILTER_DEFAULT, |
314 | | - 'timezone' => FILTER_DEFAULT, |
| 313 | + 'list_style' => FILTER_UNSAFE_RAW, |
| 314 | + 'timezone' => FILTER_UNSAFE_RAW, |
315 | 315 | 'disable_delete_prompt' => FILTER_VALIDATE_INT, |
316 | 316 | 'allow_delete_attachment' => FILTER_VALIDATE_INT, |
317 | | - 'section_state' => FILTER_DEFAULT, |
318 | | - 'section_class' => FILTER_DEFAULT, |
319 | | - 'message_ids' => FILTER_DEFAULT, |
320 | | - 'action_type' => FILTER_DEFAULT, |
321 | | - 'server_pw_id' => FILTER_DEFAULT, |
322 | | - 'message_list_since' => FILTER_DEFAULT, |
| 317 | + 'section_state' => FILTER_UNSAFE_RAW, |
| 318 | + 'section_class' => FILTER_UNSAFE_RAW, |
| 319 | + 'message_ids' => FILTER_UNSAFE_RAW, |
| 320 | + 'action_type' => FILTER_UNSAFE_RAW, |
| 321 | + 'server_pw_id' => FILTER_UNSAFE_RAW, |
| 322 | + 'message_list_since' => FILTER_UNSAFE_RAW, |
323 | 323 | 'no_password_save' => FILTER_VALIDATE_BOOLEAN, |
324 | 324 | 'start_page' => FILTER_SANITIZE_URL, |
325 | | - 'default_sort_order' => FILTER_DEFAULT, |
| 325 | + 'default_sort_order' => FILTER_UNSAFE_RAW, |
326 | 326 | 'stay_logged_in' => FILTER_VALIDATE_BOOLEAN, |
327 | 327 | 'junk_per_source' => FILTER_VALIDATE_INT, |
328 | | - 'junk_since' => FILTER_DEFAULT, |
| 328 | + 'junk_since' => FILTER_UNSAFE_RAW, |
329 | 329 | 'snoozed_per_source' => FILTER_VALIDATE_INT, |
330 | | - 'snoozed_since' => FILTER_DEFAULT, |
| 330 | + 'snoozed_since' => FILTER_UNSAFE_RAW, |
331 | 331 | 'trash_per_source' => FILTER_VALIDATE_INT, |
332 | | - 'trash_since' => FILTER_DEFAULT, |
333 | | - 'drafts_per_source' => FILTER_DEFAULT, |
334 | | - 'drafts_since' => FILTER_DEFAULT, |
| 332 | + 'trash_since' => FILTER_UNSAFE_RAW, |
| 333 | + 'drafts_per_source' => FILTER_UNSAFE_RAW, |
| 334 | + 'drafts_since' => FILTER_UNSAFE_RAW, |
335 | 335 | 'warn_for_unsaved_changes' => FILTER_VALIDATE_BOOLEAN, |
336 | | - 'srv_setup_stepper_imap_server_id' => FILTER_DEFAULT, |
337 | | - 'srv_setup_stepper_smtp_server_id' => FILTER_DEFAULT, |
338 | | - 'srv_setup_stepper_profile_name' => FILTER_DEFAULT, |
339 | | - 'srv_setup_stepper_email' => FILTER_DEFAULT, |
| 336 | + 'srv_setup_stepper_imap_server_id' => FILTER_UNSAFE_RAW, |
| 337 | + 'srv_setup_stepper_smtp_server_id' => FILTER_UNSAFE_RAW, |
| 338 | + 'srv_setup_stepper_profile_name' => FILTER_UNSAFE_RAW, |
| 339 | + 'srv_setup_stepper_email' => FILTER_UNSAFE_RAW, |
340 | 340 | 'srv_setup_stepper_password' => FILTER_UNSAFE_RAW, |
341 | | - 'srv_setup_stepper_provider' => FILTER_DEFAULT, |
| 341 | + 'srv_setup_stepper_provider' => FILTER_UNSAFE_RAW, |
342 | 342 | 'srv_setup_stepper_is_sender' => FILTER_VALIDATE_BOOLEAN, |
343 | 343 | 'srv_setup_stepper_is_receiver' => FILTER_VALIDATE_BOOLEAN, |
344 | | - 'srv_setup_stepper_smtp_address' => FILTER_DEFAULT, |
345 | | - 'srv_setup_stepper_smtp_port' => FILTER_DEFAULT, |
| 344 | + 'srv_setup_stepper_smtp_address' => FILTER_UNSAFE_RAW, |
| 345 | + 'srv_setup_stepper_smtp_port' => FILTER_UNSAFE_RAW, |
346 | 346 | 'srv_setup_stepper_smtp_tls' => FILTER_VALIDATE_BOOLEAN, |
347 | | - 'srv_setup_stepper_imap_address' => FILTER_DEFAULT, |
348 | | - 'srv_setup_stepper_imap_port' => FILTER_DEFAULT, |
| 347 | + 'srv_setup_stepper_imap_address' => FILTER_UNSAFE_RAW, |
| 348 | + 'srv_setup_stepper_imap_port' => FILTER_UNSAFE_RAW, |
349 | 349 | 'srv_setup_stepper_imap_tls' => FILTER_VALIDATE_BOOLEAN, |
350 | 350 | 'srv_setup_stepper_enable_sieve' => FILTER_VALIDATE_BOOLEAN, |
351 | 351 | 'srv_setup_stepper_create_profile' => FILTER_VALIDATE_BOOLEAN, |
352 | 352 | 'srv_setup_stepper_profile_is_default' => FILTER_VALIDATE_BOOLEAN, |
353 | | - 'srv_setup_stepper_profile_signature' => FILTER_DEFAULT, |
354 | | - 'srv_setup_stepper_profile_reply_to' => FILTER_DEFAULT, |
355 | | - 'srv_setup_stepper_imap_sieve_host' => FILTER_DEFAULT, |
| 353 | + 'srv_setup_stepper_profile_signature' => FILTER_UNSAFE_RAW, |
| 354 | + 'srv_setup_stepper_profile_reply_to' => FILTER_UNSAFE_RAW, |
| 355 | + 'srv_setup_stepper_imap_sieve_host' => FILTER_UNSAFE_RAW, |
356 | 356 | 'srv_setup_stepper_imap_sieve_mode_tls' => FILTER_VALIDATE_BOOLEAN, |
357 | 357 | 'srv_setup_stepper_only_jmap' => FILTER_VALIDATE_BOOLEAN, |
358 | 358 | 'srv_setup_stepper_jmap_hide_from_c_page' => FILTER_VALIDATE_BOOLEAN, |
359 | | - 'srv_setup_stepper_jmap_address' => FILTER_DEFAULT, |
| 359 | + 'srv_setup_stepper_jmap_address' => FILTER_UNSAFE_RAW, |
360 | 360 | 'srv_setup_stepper_imap_hide_from_c_page' => FILTER_VALIDATE_BOOLEAN, |
361 | | - 'images_whitelist' => FILTER_DEFAULT, |
| 361 | + 'images_whitelist' => FILTER_UNSAFE_RAW, |
362 | 362 | 'update' => FILTER_VALIDATE_BOOLEAN, |
363 | 363 | 'enable_child_processes' => FILTER_VALIDATE_BOOLEAN, |
364 | 364 | ) |
|
0 commit comments