bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-24 18:50:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactored some utils

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO 2018-11-03 16:28:25 +01:00
parent a4dc3deb36
commit 0f96713fe7
4 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
util/automated-search.php
View File

@ -202,7 +202,6 @@ function do_search($data = array(), $automated_search_recipients = array())
$lang = Registry::get('language'); $lang = Registry::get('language');
extract($lang->data); extract($lang->data);
$page = 0;
$title = $text_automated_search; $title = $text_automated_search;
if($data['id'] != '') { $title .= $data['id']; } if($data['id'] != '') { $title .= $data['id']; }
@ -246,7 +245,7 @@ function do_search($data = array(), $automated_search_recipients = array())
ob_end_clean(); ob_end_clean();
$x = $mail->send_smtp_email(SMARTHOST, SMARTHOST_PORT, SMTP_DOMAIN, SMTP_FROMADDR, $automated_search_recipients, $msg); $mail->send_smtp_email(SMARTHOST, SMARTHOST_PORT, SMTP_DOMAIN, SMTP_FROMADDR, $automated_search_recipients, $msg);
} }
else { else {
print "search = " . $data['search'] . "\n"; print "search = " . $data['search'] . "\n";

4
util/download-imap.php
View File

@ -75,7 +75,7 @@ function download_users_emails($storage) {
$folders = new RecursiveIteratorIterator($storage->getFolders(), RecursiveIteratorIterator::SELF_FIRST); $folders = new RecursiveIteratorIterator($storage->getFolders(), RecursiveIteratorIterator::SELF_FIRST);
foreach ($folders as $localName => $folder) { foreach ($folders as $folder) {
$__folder = preg_replace("/\W/", "_", $folder); $__folder = preg_replace("/\W/", "_", $folder);
@ -131,5 +131,3 @@ function usage() {
exit; exit;
} }

4
util/pilerpurge.py
View File

@ -18,7 +18,6 @@ SQL_PURGE_SELECT_QUERY = "SELECT piler_id, size FROM " +\
"legal_hold))" "legal_hold))"
opts = {} opts = {}
default_conf = "/usr/local/etc/piler/piler.conf"
def read_options(filename="", opts={}): def read_options(filename="", opts={}):
@ -164,9 +163,6 @@ def get_attachment_file_path(piler_id='', attachment_id=0, opts={}):
def main(): def main():
if "/usr/libexec" in __file__:
default_conf = "/etc/piler/piler.conf"
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("-c", "--config", type=str, help="piler.conf path", parser.add_argument("-c", "--config", type=str, help="piler.conf path",
default="/etc/piler/piler.conf") default="/etc/piler/piler.conf")

66
util/sign.php
View File

@ -1,5 +1,12 @@
<?php <?php
define(COUNT, 'count');
define(HASH_VALUE, 'hash_value');
define(RESPONSE_STRING, 'response_string');
define(RESPONSE_TIME, 'response_time');
define(START_ID, 'start_id');
define(STOP_ID, 'stop_id');
ini_set("session.save_path", "/tmp"); ini_set("session.save_path", "/tmp");
$webuidir = ""; $webuidir = "";
@ -20,15 +27,14 @@ if ( $options = getopt( $opts, $lopts ) )
$webuidir = $options['webui']; $webuidir = $options['webui'];
} else } else
{ {
echo("\nError: must provide path to WebUI directory\n\n"); echo "\nError: must provide path to WebUI directory\n\n";
display_help(); display_help();
exit; exit;
} }
if ( isset($options['mode']) ) if ( isset($options['mode']) && $options['mode'] == 'time') {
{ $mode = $options['mode'];
if($options['mode'] == 'time') { $mode = $options['mode']; }
} }
if ( isset($options['h']) ) if ( isset($options['h']) )
@ -36,6 +42,7 @@ if ( $options = getopt( $opts, $lopts ) )
display_help(); display_help();
exit; exit;
} }
if ( isset($options['verbose']) ) if ( isset($options['verbose']) )
{ {
$verbose = 1; $verbose = 1;
@ -63,30 +70,28 @@ define('MODE', $mode);
$data = get_hash_values(); $data = get_hash_values();
//print_r($data);
// check if we have enough messages // check if we have enough messages
if(MODE == 'unit' && $data['count'] < TSA_STAMP_REQUEST_UNIT_SIZE) { if(MODE == 'unit' && $data[COUNT] < TSA_STAMP_REQUEST_UNIT_SIZE) {
syslog(LOG_INFO, "not enough messages to sign yet (" . $data['count'] . ")"); syslog(LOG_INFO, "not enough messages to sign yet (" . $data[COUNT] . ")");
exit; exit;
} }
if(MODE == 'time' && $data['count'] < 1) { if(MODE == 'time' && $data[COUNT] < 1) {
syslog(LOG_INFO, "not enough messages to sign yet (" . $data['count'] . ")"); syslog(LOG_INFO, "not enough messages to sign yet (" . $data[COUNT] . ")");
exit; exit;
} }
$requestfile_path = TrustedTimestamps::createRequestfile($data['hash_value']); $requestfile_path = TrustedTimestamps::createRequestfile($data[HASH_VALUE]);
$response = TrustedTimestamps::signRequestfile($requestfile_path, TSA_URL); $response = TrustedTimestamps::signRequestfile($requestfile_path, TSA_URL);
$data['response_string'] = $response['response_string']; $data[RESPONSE_STRING] = $response[RESPONSE_STRING];
$data['response_time'] = $response['response_time']; $data[RESPONSE_TIME] = $response[RESPONSE_TIME];
$rc = store_results($data); $rc = store_results($data);
if($rc == 1) { syslog(LOG_INFO, "signed " . $data['count'] . " messages (" . $data['start_id'] . "-" . $data['stop_id'] . ") on @" . $data['response_time']); } if($rc == 1) { syslog(LOG_INFO, "signed " . $data[COUNT] . " messages (" . $data[START_ID] . "-" . $data[STOP_ID] . ") on @" . $data[RESPONSE_TIME]); }
else { syslog(LOG_INFO, "ERROR: failed to sign " . $data['count'] . " messages (" . $data['start_id'] . "-" . $data['stop_id'] . ") on @" . $data['response_time']); } else { syslog(LOG_INFO, "ERROR: failed to sign " . $data[COUNT] . " messages (" . $data[START_ID] . "-" . $data[STOP_ID] . ") on @" . $data[RESPONSE_TIME]); }
@ -99,7 +104,7 @@ function get_last_entry_from_timestamp_table() {
return 0; return 0;
} }
return $query->row['stop_id']; return $query->row[STOP_ID];
} }
@ -132,10 +137,10 @@ function get_hash_values() {
if(MODE == 'time') { $stop_id = $start_id + $count - 1; } if(MODE == 'time') { $stop_id = $start_id + $count - 1; }
return array( return array(
'start_id' => $start_id, START_ID => $start_id,
'stop_id' => $stop_id, STOP_ID => $stop_id,
'count' => $count, COUNT => $count,
'hash_value' => sha1($s) HASH_VALUE => sha1($s)
); );
} }
@ -144,23 +149,18 @@ function get_hash_values() {
function store_results($data = array()) { function store_results($data = array()) {
$db = Registry::get('db'); $db = Registry::get('db');
$query = $db->query("INSERT INTO " . TABLE_TIMESTAMP . " (start_id, stop_id, hash_value, `count`, response_time, response_string) VALUES(?,?,?,?,?,?)", array($data['start_id'], $data['stop_id'], $data['hash_value'], $data['count'], $data['response_time'], $data['response_string'])); $db->query("INSERT INTO " . TABLE_TIMESTAMP . " (start_id, stop_id, hash_value, `count`, response_time, response_string) VALUES(?,?,?,?,?,?)", array($data[START_ID], $data[STOP_ID], $data[HASH_VALUE], $data[COUNT], $data[RESPONSE_TIME], $data[RESPONSE_STRING]));
$rc = $db->countAffected(); return $db->countAffected();
return $rc;
} }
function display_help() { function display_help() {
$phpself = basename(__FILE__); $phpself = basename(__FILE__);
echo("\nUsage: $phpself --webui [PATH] [OPTIONS...]\n\n"); echo "\nUsage: $phpself --webui [PATH] [OPTIONS...]\n\n";
echo("\t--webui=\"[REQUIRED: path to the Piler WebUI Directory]\"\n\n"); echo "\t--webui=\"[REQUIRED: path to the Piler WebUI Directory]\"\n\n";
echo("options:\n"); echo "options:\n";
echo("\t--mode time|unit (default: unit)\n"); echo "\t--mode time|unit (default: unit)\n";
echo("\t-v Provide a verbose output\n"); echo "\t-v Provide a verbose output\n";
echo("\t-h Prints this help screen and exits\n"); echo "\t-h Prints this help screen and exits\n";
} }
?>