george/PrivateBin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

turning Sjcl test case into property based one, implemented paste generator facility in Helper

Browse Source
This commit is contained in:
El RIDO
2017-02-26 16:46:10 +01:00
parent aad162895c
commit 6a9f3303dc
2 changed files with 160 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
tst/Bootstrap.php
View File

@@ -1,6 +1,7 @@
<?php
use PrivateBin\Persistence\ServerSalt;
use Eris\Generator;
error_reporting(E_ALL | E_STRICT);
@@ -110,7 +111,7 @@ class Helper
}
/**
* get example paste
* get example paste as JSON
*
* @return array
*/
@@ -129,6 +130,68 @@ class Helper
return json_encode($example);
}
/**
* get paste generator
*
* @return array
*/
public static function getPasteGenerator($meta = array(), $withAttachment = false)
{
$generatedMeta = array(
'salt' => ServerSalt::generate(),
'formatter' => Generator\elements('plaintext', 'syntaxhighlighting', 'markdown'),
'postdate' => Generator\int(),
'opendiscussion' => Generator\elements(true, false),
);
$generatedMeta = array_merge($generatedMeta, $meta);
$example = array(
'data' => Generator\associative(array(
'iv' => Generator\vector(16, Generator\byte()),
'v' => 1,
'iter' => Generator\choose(100, 100000),
'ks' => Generator\elements(128, 192, 256),
'ts' => Generator\elements(64, 96, 128),
'mode' => Generator\elements('ccm', 'ocb2', 'gcm'),
'adata' => Generator\string(),
'cipher'=> 'aes',
'salt' => Generator\vector(8, Generator\byte()),
'ct' => Generator\seq(Generator\byte()),
)),
'meta' => Generator\associative($generatedMeta),
);
if ($withAttachment) {
$example['attachment'] = $example['attachmentname'] = $example['data'];
}
return Generator\associative($example);
}
/**
* get paste from generated random array
*
* @return array
*/
public static function getPasteFromGeneratedArray($paste)
{
$paste['data']['iv'] = self::byteArray2Base64($paste['data']['iv']);
$paste['data']['salt'] = self::byteArray2Base64($paste['data']['salt']);
// deflate cipher text to maximize entropy
$paste['data']['ct'] = self::byteArray2Base64($paste['data']['ct'], true);
$paste['data'] = json_encode($paste['data']);
if (array_key_exists('attachment', $paste)) {
$paste['attachment']['iv'] = self::byteArray2Base64($paste['attachment']['iv']);
$paste['attachment']['salt'] = self::byteArray2Base64($paste['attachment']['salt']);
$paste['attachment']['ct'] = self::byteArray2Base64($paste['attachment']['ct'], true);
$paste['attachment'] = json_encode($paste['attachment']);
}
if (array_key_exists('attachmentname', $paste)) {
$paste['attachmentname']['iv'] = self::byteArray2Base64($paste['attachmentname']['iv']);
$paste['attachmentname']['salt'] = self::byteArray2Base64($paste['attachmentname']['salt']);
$paste['attachmentname']['ct'] = self::byteArray2Base64($paste['attachmentname']['ct'], true);
$paste['attachmentname'] = json_encode($paste['attachmentname']);
}
return $paste;
}
/**
* get example paste ID
*
@@ -282,6 +345,24 @@ class Helper
}
}
/**
* get example paste ID
*
* @param array $bytes
* @return string
*/
public static function byteArray2Base64($bytes, $deflate = false)
{
$string = implode(
array_map('chr', $bytes)
);
// optional deflate to maximize entropy
if ($deflate) {
$string = gzdeflate($string);
}
return base64_encode($string);
}
/**
* update all templates with the latest SRI hashes for all JS files
*