Skip to content

Commit

Permalink
rewrite functions. Only hash(string, method), md5(string) and sha256(…
Browse files Browse the repository at this point in the history 
…string) are available now
  • Loading branch information
@lbartoletti @nyalldawson
lbartoletti authored and nyalldawson committed Oct 25, 2019
1 parent ba7770c commit 3b9c240
Show file tree
Hide file tree
Showing 17 changed files with 130 additions and 265 deletions.
5 changes: 0 additions & 5 deletions resources/function_help/json/Hash
View file

This file was deleted.

42 changes: 42 additions & 0 deletions resources/function_help/json/hash
View file
@@ -0,0 +1,42 @@

{
"name": "hash",
"type": "function",
"description": "Creates a hash from a string with a given method.",
"variableLenArguments": false,
"arguments": [
{"arg":"string", "description": "the string to hash"}, {"arg":"method",
"description": "The hash method among 'md4', 'md5', 'sha1', 'sha224', 'sha384', 'sha512', 'sha3_224', 'sha3_256', 'sha3_384', 'sha3_512', 'keccak_224', 'keccak_256', 'keccak_384', 'keccak_512'"}],
"examples": [
{ "expression":"md4('QGIS')",
"returns":"'c0fc71c241cdebb6e888cbac0e2b68eb'"},
{ "expression":"md5('QGIS')",
"returns":"'57470aaa9e22adaefac7f5f342f1c6da'"},
{ "expression":"sha1('QGIS')",
"returns":"'f87cfb2b74cdd5867db913237024e7001e62b114'"},
{ "expression":"sha224('QGIS')",
"returns":"'4093a619ada631c770f44bc643ead18fb393b93d6a6af1861fcfece0'"},
{ "expression":"sha256('QGIS')",
"returns":"'eb045cba7a797aaa06ac58830846e40c8e8c780bc0676d3393605fae50c05309'"},
{ "expression":"sha384('QGIS')",
"returns":"'91c1de038cc3d09fdd512e99f9dd9922efadc39ed21d3922e69a4305cc25506033aee388e554b78714c8734f9cd7e610'"},
{ "expression":"sha512('QGIS')",
"returns":"'c2c092f2ab743bf8edbeb6d028a745f30fc720408465ed369421f0a4e20fa5e27f0c90ad72d3f1d836eaa5d25cd39897d4cf77e19984668ef58da6e3159f18ac'"},
{ "expression":"sha3_224('QGIS')",
"returns":"'467f49a5039e7280d5d42fd433e80d203439e338eaabd701f0d6c17d'"},
{ "expression":"sha3_256('QGIS')",
"returns":"'540f7354b6b8a6e735f2845250f15f4f3ba4f666c55574d9e9354575de0e980f'"},
{ "expression":"sha3_384('QGIS')",
"returns":"'96052da1e77679e9a65f60d7ead961b287977823144786386eb43647b0901fd8516fa6f1b9d243fb3f28775e6dde6107'"},
{ "expression":"sha3_512('QGIS')",
"returns":"'900d079dc69761da113980253aa8ac0414a8bd6d09879a916228f8743707c4758051c98445d6b8945ec854ff90655005e02aceb0a2ffc6a0ebf818745d665349'"},
{ "expression":"keccak_224('QGIS')",
"returns":"'5b0ce6acef8b0a121d4ac4f3eaa8503c799ad4e26a3392d1fb201478'"},
{ "expression":"keccak_256('QGIS')",
"returns":"'991c520aa6815392de24087f61b2ae0fd56abbfeee4a8ca019c1011d327c577e'"},
{ "expression":"keccak_384('QGIS')",
"returns":"'c57a3aed9d856fa04e5eeee9b62b6e027cca81ba574116d3cc1f0d48a1ef9e5886ff463ea8d0fac772ee473bf92f810d'"},
{ "expression":"keccak_512('QGIS')",
"returns":"'6f0f751776b505e317de222508fa5d3ed7099d8f07c74fed54ccee6e7cdc6b89b4a085e309f2ee5210c9'"}
]
}
11 changes: 0 additions & 11 deletions resources/function_help/json/keccak_224
View file

This file was deleted.

11 changes: 0 additions & 11 deletions resources/function_help/json/keccak_256
View file

This file was deleted.

11 changes: 0 additions & 11 deletions resources/function_help/json/keccak_384
View file

This file was deleted.

11 changes: 0 additions & 11 deletions resources/function_help/json/keccak_512
View file

This file was deleted.

11 changes: 0 additions & 11 deletions resources/function_help/json/md4
View file

This file was deleted.

11 changes: 0 additions & 11 deletions resources/function_help/json/sha1
View file

This file was deleted.

11 changes: 0 additions & 11 deletions resources/function_help/json/sha224
View file

This file was deleted.

11 changes: 0 additions & 11 deletions resources/function_help/json/sha384
View file

This file was deleted.

11 changes: 0 additions & 11 deletions resources/function_help/json/sha3_224
View file

This file was deleted.

11 changes: 0 additions & 11 deletions resources/function_help/json/sha3_256
View file

This file was deleted.

11 changes: 0 additions & 11 deletions resources/function_help/json/sha3_384
View file

This file was deleted.

11 changes: 0 additions & 11 deletions resources/function_help/json/sha3_512
View file

This file was deleted.

11 changes: 0 additions & 11 deletions resources/function_help/json/sha512
View file

This file was deleted.

161 changes: 71 additions & 90 deletions src/core/expression/qgsexpressionfunction.cpp
View file
Expand Up @@ -4993,84 +4993,89 @@ static QVariant fcnFileSize( const QVariantList &values, const QgsExpressionCont

static QVariant fcnHash( const QString str, const QCryptographicHash::Algorithm algorithm )
{

return QString( QCryptographicHash::hash( str.toUtf8(), algorithm ).toHex() );
}

static QVariant fcnHashMd4( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent, const QgsExpressionNodeFunction * )
static QVariant fcnGenericHash( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent, const QgsExpressionNodeFunction * )
{
return fcnHash( QgsExpressionUtils::getStringValue( values.at( 0 ), parent ), QCryptographicHash::Md4 );
QVariant hash;
QString str = QgsExpressionUtils::getStringValue( values.at( 0 ), parent );
QString method = QgsExpressionUtils::getStringValue( values.at( 1 ), parent ).toLower();

if ( method == QString( "md4" ) )
{
hash = fcnHash( str, QCryptographicHash::Md4 );
}
else if ( method == QString( "md5" ) )
{
hash = fcnHash( str, QCryptographicHash::Md5 );
}
else if ( method == QString( "sha1" ) )
{
hash = fcnHash( str, QCryptographicHash::Sha1 );
}
else if ( method == QString( "sha224" ) )
{
hash = fcnHash( str, QCryptographicHash::Sha224 );
}
else if ( method == QString( "sha256" ) )
{
hash = fcnHash( str, QCryptographicHash::Sha256 );
}
else if ( method == QString( "sha384" ) )
{
hash = fcnHash( str, QCryptographicHash::Sha384 );
}
else if ( method == QString( "sha512" ) )
{
hash = fcnHash( str, QCryptographicHash::Sha512 );
}
else if ( method == QString( "sha3_224" ) )
{
hash = fcnHash( str, QCryptographicHash::Sha3_224 );
}
else if ( method == QString( "sha3_256" ) )
{
hash = fcnHash( str, QCryptographicHash::Sha3_256 );
}
else if ( method == QString( "sha3_384" ) )
{
hash = fcnHash( str, QCryptographicHash::Sha3_384 );
}
else if ( method == QString( "sha3_512" ) )
{
hash = fcnHash( str, QCryptographicHash::Sha3_512 );
}
else if ( method == QString( "keccak_224" ) )
{
hash = fcnHash( str, QCryptographicHash::Keccak_224 );
}
else if ( method == QString( "keccak_256" ) )
{
hash = fcnHash( str, QCryptographicHash::Keccak_256 );
}
else if ( method == QString( "keccak_384" ) )
{
hash = fcnHash( str, QCryptographicHash::Keccak_384 );
}
else if ( method == QString( "keccak_512" ) )
{
hash = fcnHash( str, QCryptographicHash::Keccak_512 );
}
return hash;
}

static QVariant fcnHashMd5( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent, const QgsExpressionNodeFunction * )
{
return fcnHash( QgsExpressionUtils::getStringValue( values.at( 0 ), parent ), QCryptographicHash::Md5 );
}

static QVariant fcnHashSha1( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent, const QgsExpressionNodeFunction * )
{
return fcnHash( QgsExpressionUtils::getStringValue( values.at( 0 ), parent ), QCryptographicHash::Sha1 );
}

static QVariant fcnHashSha224( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent, const QgsExpressionNodeFunction * )
{
return fcnHash( QgsExpressionUtils::getStringValue( values.at( 0 ), parent ), QCryptographicHash::Sha224 );
}

static QVariant fcnHashSha256( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent, const QgsExpressionNodeFunction * )
{
return fcnHash( QgsExpressionUtils::getStringValue( values.at( 0 ), parent ), QCryptographicHash::Sha256 );
}

static QVariant fcnHashSha384( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent, const QgsExpressionNodeFunction * )
{
return fcnHash( QgsExpressionUtils::getStringValue( values.at( 0 ), parent ), QCryptographicHash::Sha384 );
}

static QVariant fcnHashSha512( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent, const QgsExpressionNodeFunction * )
{
return fcnHash( QgsExpressionUtils::getStringValue( values.at( 0 ), parent ), QCryptographicHash::Sha512 );
}

static QVariant fcnHashSha3_224( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent, const QgsExpressionNodeFunction * )
{
return fcnHash( QgsExpressionUtils::getStringValue( values.at( 0 ), parent ), QCryptographicHash::Sha3_224 );
}

static QVariant fcnHashSha3_256( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent, const QgsExpressionNodeFunction * )
{
return fcnHash( QgsExpressionUtils::getStringValue( values.at( 0 ), parent ), QCryptographicHash::Sha3_256 );
}

static QVariant fcnHashSha3_384( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent, const QgsExpressionNodeFunction * )
{
return fcnHash( QgsExpressionUtils::getStringValue( values.at( 0 ), parent ), QCryptographicHash::Sha3_384 );
}

static QVariant fcnHashSha3_512( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent, const QgsExpressionNodeFunction * )
{
return fcnHash( QgsExpressionUtils::getStringValue( values.at( 0 ), parent ), QCryptographicHash::Sha3_512 );
}

static QVariant fcnHashKeccak_224( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent, const QgsExpressionNodeFunction * )
{
return fcnHash( QgsExpressionUtils::getStringValue( values.at( 0 ), parent ), QCryptographicHash::Keccak_224 );
}

static QVariant fcnHashKeccak_256( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent, const QgsExpressionNodeFunction * )
{
return fcnHash( QgsExpressionUtils::getStringValue( values.at( 0 ), parent ), QCryptographicHash::Keccak_256 );
}

static QVariant fcnHashKeccak_384( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent, const QgsExpressionNodeFunction * )
{
return fcnHash( QgsExpressionUtils::getStringValue( values.at( 0 ), parent ), QCryptographicHash::Keccak_384 );
}

static QVariant fcnHashKeccak_512( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent, const QgsExpressionNodeFunction * )
{
return fcnHash( QgsExpressionUtils::getStringValue( values.at( 0 ), parent ), QCryptographicHash::Keccak_512 );
}

const QList<QgsExpressionFunction *> &QgsExpression::Functions()
{
// The construction of the list isn't thread-safe, and without the mutex,
Expand Down Expand Up @@ -5366,36 +5371,12 @@ const QList<QgsExpressionFunction *> &QgsExpression::Functions()
fcnFileSize, QStringLiteral( "Files and Paths" ) )

// hash
<< new QgsStaticExpressionFunction( QStringLiteral( "md4" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "string" ) ),
fcnHashMd4, QStringLiteral( "Hash" ) )
<< new QgsStaticExpressionFunction( QStringLiteral( "hash" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "string" ) ) << QgsExpressionFunction::Parameter( QStringLiteral( "method" ) ),
fcnGenericHash, QStringLiteral( "Conversions" ) )
<< new QgsStaticExpressionFunction( QStringLiteral( "md5" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "string" ) ),
fcnHashMd5, QStringLiteral( "Hash" ) )
<< new QgsStaticExpressionFunction( QStringLiteral( "sha1" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "string" ) ),
fcnHashSha1, QStringLiteral( "Hash" ) )
<< new QgsStaticExpressionFunction( QStringLiteral( "sha224" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "string" ) ),
fcnHashSha224, QStringLiteral( "Hash" ) )
fcnHashMd5, QStringLiteral( "Conversions" ) )
<< new QgsStaticExpressionFunction( QStringLiteral( "sha256" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "string" ) ),
fcnHashSha256, QStringLiteral( "Hash" ) )
<< new QgsStaticExpressionFunction( QStringLiteral( "sha384" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "string" ) ),
fcnHashSha384, QStringLiteral( "Hash" ) )
<< new QgsStaticExpressionFunction( QStringLiteral( "sha512" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "string" ) ),
fcnHashSha512, QStringLiteral( "Hash" ) )
<< new QgsStaticExpressionFunction( QStringLiteral( "sha3_224" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "string" ) ),
fcnHashSha3_224, QStringLiteral( "Hash" ) )
<< new QgsStaticExpressionFunction( QStringLiteral( "sha3_256" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "string" ) ),
fcnHashSha3_256, QStringLiteral( "Hash" ) )
<< new QgsStaticExpressionFunction( QStringLiteral( "sha3_384" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "string" ) ),
fcnHashSha3_384, QStringLiteral( "Hash" ) )
<< new QgsStaticExpressionFunction( QStringLiteral( "sha3_512" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "string" ) ),
fcnHashSha3_512, QStringLiteral( "Hash" ) )
<< new QgsStaticExpressionFunction( QStringLiteral( "keccak_224" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "string" ) ),
fcnHashKeccak_224, QStringLiteral( "Hash" ) )
<< new QgsStaticExpressionFunction( QStringLiteral( "keccak_256" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "string" ) ),
fcnHashKeccak_256, QStringLiteral( "Hash" ) )
<< new QgsStaticExpressionFunction( QStringLiteral( "keccak_384" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "string" ) ),
fcnHashKeccak_384, QStringLiteral( "Hash" ) )
<< new QgsStaticExpressionFunction( QStringLiteral( "keccak_512" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "string" ) ),
fcnHashKeccak_512, QStringLiteral( "Hash" ) )
fcnHashSha256, QStringLiteral( "Conversions" ) )

// deprecated stuff - hidden from users
<< new QgsStaticExpressionFunction( QStringLiteral( "$scale" ), QgsExpressionFunction::ParameterList(), fcnMapScale, QStringLiteral( "deprecated" ) );
Expand Down

0 comments on commit 3b9c240

Please sign in to comment.