Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No Plat: enforce strict validation on input fields #6003

Merged
merged 2 commits into from Sep 4, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev
Use constas for patterns
  • Loading branch information
yossipapi committed Sep 4, 2017
commit a63362aa87d668d5ebf4a89cdd5bb8b815ac7f70
10 changes: 5 additions & 5 deletions admin_console/web/tools/bigRedButton.php
Expand Up @@ -8,8 +8,8 @@
if(!isset($_GET['playerVersion']))
die('html5 lib version must be supplied in query string');

$partnerId = safeGetInput('partnerId', '/[^0-9]/');
$html5Version = safeGetInput('playerVersion', '/[^v0-9.]/');
$partnerId = safeGetInput('partnerId', INTEGER_ONLY_PATTERN);
$html5Version = safeGetInput('playerVersion', HTML_VERSION_PATTERN);
?>
<!DOCTYPE html>
<!--[if lt IE 7]> <html class="lt-ie10 lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
Expand Down Expand Up @@ -307,15 +307,15 @@ function updateSystemTime()
</tr>
<tr>
<td>Admin Secret:</td>
<td><input type="text" id="txtSecret" value="<?php echo isset($_GET['secret']) ? safeGetInput('secret', '/[^A-Za-z0-9]/') : ''; ?>" />
<td><input type="text" id="txtSecret" value="<?php echo isset($_GET['secret']) ? safeGetInput('secret', SECRET_PATTERN) : ''; ?>" />
</td>
<tr>
<td>Entry Id:</td>
<td><input type="text" id="txtEntryId" value="<?php echo isset($_GET['entryId']) ? safeGetInput('entryId', '/[^a-z0-9_]/') : ''; ?>" />
<td><input type="text" id="txtEntryId" value="<?php echo isset($_GET['entryId']) ? safeGetInput('entryId', ENTRY_ID_PATTERN) : ''; ?>" />
</td>
<tr>
<td>uiConf Id:</td>
<td><input type="text" id="txtUiConfId" value="<?php echo isset($_GET['uiConfId']) ? safeGetInput('uiConfId', '/[^0-9]/') : ''; ?>" />
<td><input type="text" id="txtUiConfId" value="<?php echo isset($_GET['uiConfId']) ? safeGetInput('uiConfId', INTEGER_ONLY_PATTERN) : ''; ?>" />
</td>
<tr>
<td colspan="2">
Expand Down
12 changes: 6 additions & 6 deletions admin_console/web/tools/bigRedButtonPtsPoc.php
Expand Up @@ -7,8 +7,8 @@
if(!isset($_GET['playerVersion']))
die('html5 lib version must be supplied in query string');

$partnerId = safeGetInput('partnerId', '/[^0-9]/');
$html5Version = safeGetInput('playerVersion', '/[^v0-9.]/');
$partnerId = safeGetInput('partnerId', INTEGER_ONLY_PATTERN);
$html5Version = safeGetInput('playerVersion', HTML_VERSION_PATTERN);

?>
<!DOCTYPE html>
Expand Down Expand Up @@ -212,19 +212,19 @@ function sendAd(){
<table>
<tr style="display: none; ">
<td>Admin Secret:</td>
<td><input type="text" id="txtSecret" value="<?php echo isset($_GET['secret']) ? safeGetInput('secret', '/[^A-Za-z0-9]/') : ''; ?>" />
<td><input type="text" id="txtSecret" value="<?php echo isset($_GET['secret']) ? safeGetInput('secret', SECRET_PATTERN) : ''; ?>" />
</td>
<tr style="display: none; ">
<td>Entry Id:</td>
<td><input type="text" id="txtEntryId" value="<?php echo isset($_GET['entryId']) ? safeGetInput('entryId', '/[^a-z0-9_]/') : ''; ?>" />
<td><input type="text" id="txtEntryId" value="<?php echo isset($_GET['entryId']) ? safeGetInput('entryId', ENTRY_ID_PATTERN) : ''; ?>" />
</td>
<tr style="display: none; ">
<td>Admin uiConf Id:</td>
<td><input type="text" id="txtAdminUiConfId" value="<?php echo isset($_GET['adminUiConfId']) ? safeGetInput('adminUiConfId', '/[^0-9]/') : ''; ?>" />
<td><input type="text" id="txtAdminUiConfId" value="<?php echo isset($_GET['adminUiConfId']) ? safeGetInput('adminUiConfId', INTEGER_ONLY_PATTERN) : ''; ?>" />
</td>
<tr style="display: none; ">
<td>User uiConf Id:</td>
<td><input type="text" id="txtUiConfId" value="<?php echo isset($_GET['uiConfId']) ? safeGetInput('uiConfId', '/[^0-9]/') : ''; ?>" />
<td><input type="text" id="txtUiConfId" value="<?php echo isset($_GET['uiConfId']) ? safeGetInput('uiConfId', INTEGER_ONLY_PATTERN) : ''; ?>" />
</td>
<tr style="display: none; ">
<td colspan="2">
Expand Down
5 changes: 5 additions & 0 deletions admin_console/web/tools/safeGetInput.php
@@ -1,5 +1,10 @@
<?php

CONST SECRET_PATTERN = '/[^a-z0-9]/';
CONST ENTRY_ID_PATTERN = '/[^a-z0-9_]/';
CONST INTEGER_ONLY_PATTERN = '/[^0-9]/';
CONST HTML_VERSION_PATTERN = '/[^v0-9.]/';

function safeGetInput($filedName, $pattern)
{
$fieldValue = $_GET[$filedName];
Expand Down
12 changes: 6 additions & 6 deletions alpha/web/lib/bigRedButtonPtsPocHlsjs.php
Expand Up @@ -7,8 +7,8 @@
if(!isset($_GET['playerVersion']))
die('html5 lib version must be supplied in query string');

$partnerId = safeGetInput('partnerId', '/[^0-9]/');
$html5Version = safeGetInput('playerVersion', '/[^v0-9.]/');
$partnerId = safeGetInput('partnerId', INTEGER_ONLY_PATTERN);
$html5Version = safeGetInput('playerVersion', HTML_VERSION_PATTERN);

?>
<!DOCTYPE html>
Expand Down Expand Up @@ -214,19 +214,19 @@ function sendAd(){
<table>
<tr style="display: none; ">
<td>Admin Secret:</td>
<td><input type="text" id="txtSecret" value="<?php echo isset($_GET['secret']) ? safeGetInput('secret', '/[^A-Za-z0-9]/') : ''; ?>" />
<td><input type="text" id="txtSecret" value="<?php echo isset($_GET['secret']) ? safeGetInput('secret', SECRET_PATTERN) : ''; ?>" />
</td>
<tr style="display: none; ">
<td>Entry Id:</td>
<td><input type="text" id="txtEntryId" value="<?php echo isset($_GET['entryId']) ? safeGetInput('entryId', '/[^a-z0-9_]/') : ''; ?>" />
<td><input type="text" id="txtEntryId" value="<?php echo isset($_GET['entryId']) ? safeGetInput('entryId', ENTRY_ID_PATTERN) : ''; ?>" />
</td>
<tr style="display: none; ">
<td>Admin uiConf Id:</td>
<td><input type="text" id="txtAdminUiConfId" value="<?php echo isset($_GET['adminUiConfId']) ? safeGetInput('adminUiConfId', '/[^0-9]/') : ''; ?>" />
<td><input type="text" id="txtAdminUiConfId" value="<?php echo isset($_GET['adminUiConfId']) ? safeGetInput('adminUiConfId', INTEGER_ONLY_PATTERN) : ''; ?>" />
</td>
<tr style="display: none; ">
<td>User uiConf Id:</td>
<td><input type="text" id="txtUiConfId" value="<?php echo isset($_GET['uiConfId']) ? safeGetInput('uiConfId', '/[^0-9]/') : ''; ?>" />
<td><input type="text" id="txtUiConfId" value="<?php echo isset($_GET['uiConfId']) ? safeGetInput('uiConfId', INTEGER_ONLY_PATTERN) : ''; ?>" />
</td>
<tr style="display: none; ">
<td colspan="2">
Expand Down