mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
Merge pull request #277 from gradido/login_check_user_send_themself_gradidos
add validation, check if user has tried to send themself gradidos
This commit is contained in:
commit
ccbe61300d
@ -67,7 +67,7 @@ namespace model {
|
|||||||
const static char functionName[] = { "GroupMemberUpdate::validate" };
|
const static char functionName[] = { "GroupMemberUpdate::validate" };
|
||||||
if (mProtoMemberUpdate.user_pubkey().size() != KeyPairEd25519::getPublicKeySize()) {
|
if (mProtoMemberUpdate.user_pubkey().size() != KeyPairEd25519::getPublicKeySize()) {
|
||||||
addError(new Error(functionName, "pubkey not set or wrong size"));
|
addError(new Error(functionName, "pubkey not set or wrong size"));
|
||||||
return TRANSCATION_VALID_INVALID_PUBKEY;
|
return TRANSACTION_VALID_INVALID_PUBKEY;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mProtoMemberUpdate.member_update_type() != proto::gradido::GroupMemberUpdate::ADD_USER) {
|
if (mProtoMemberUpdate.member_update_type() != proto::gradido::GroupMemberUpdate::ADD_USER) {
|
||||||
|
|||||||
@ -590,7 +590,7 @@ namespace model {
|
|||||||
auto result = validate();
|
auto result = validate();
|
||||||
if (TRANSACTION_VALID_OK != result) {
|
if (TRANSACTION_VALID_OK != result) {
|
||||||
if ( TRANSACTION_VALID_MISSING_SIGN == result || TRANSACTION_VALID_CODE_ERROR == result
|
if ( TRANSACTION_VALID_MISSING_SIGN == result || TRANSACTION_VALID_CODE_ERROR == result
|
||||||
|| TRANSACTION_VALID_MISSING_PARAM == result || TRANSCATION_VALID_INVALID_PUBKEY == result
|
|| TRANSACTION_VALID_MISSING_PARAM == result || TRANSACTION_VALID_INVALID_PUBKEY == result
|
||||||
|| TRANSACTION_VALID_INVALID_SIGN == result) {
|
|| TRANSACTION_VALID_INVALID_SIGN == result) {
|
||||||
addError(new ParamError(function_name, "code error", TransactionValidationToString(result)));
|
addError(new ParamError(function_name, "code error", TransactionValidationToString(result)));
|
||||||
//sendErrorsAsEmail();
|
//sendErrorsAsEmail();
|
||||||
|
|||||||
@ -17,7 +17,7 @@ namespace model {
|
|||||||
case TRANSACTION_VALID_INVALID_TARGET_DATE: return "invalid target date";
|
case TRANSACTION_VALID_INVALID_TARGET_DATE: return "invalid target date";
|
||||||
case TRANSACTION_VALID_CREATION_OUT_OF_BORDER: return "creation out of border";
|
case TRANSACTION_VALID_CREATION_OUT_OF_BORDER: return "creation out of border";
|
||||||
case TRANSACTION_VALID_INVALID_AMOUNT: return "invalid amount";
|
case TRANSACTION_VALID_INVALID_AMOUNT: return "invalid amount";
|
||||||
case TRANSCATION_VALID_INVALID_PUBKEY: return "invalid pubkey";
|
case TRANSACTION_VALID_INVALID_PUBKEY: return "invalid pubkey";
|
||||||
case TRANSACTION_VALID_INVALID_GROUP_ALIAS: return "invalid group alias";
|
case TRANSACTION_VALID_INVALID_GROUP_ALIAS: return "invalid group alias";
|
||||||
case TRANSACTION_VALID_INVALID_SIGN: return "invalid sign";
|
case TRANSACTION_VALID_INVALID_SIGN: return "invalid sign";
|
||||||
}
|
}
|
||||||
|
|||||||
@ -29,7 +29,7 @@ namespace model {
|
|||||||
TRANSACTION_VALID_INVALID_TARGET_DATE,
|
TRANSACTION_VALID_INVALID_TARGET_DATE,
|
||||||
TRANSACTION_VALID_CREATION_OUT_OF_BORDER,
|
TRANSACTION_VALID_CREATION_OUT_OF_BORDER,
|
||||||
TRANSACTION_VALID_INVALID_AMOUNT,
|
TRANSACTION_VALID_INVALID_AMOUNT,
|
||||||
TRANSCATION_VALID_INVALID_PUBKEY,
|
TRANSACTION_VALID_INVALID_PUBKEY,
|
||||||
TRANSACTION_VALID_INVALID_GROUP_ALIAS,
|
TRANSACTION_VALID_INVALID_GROUP_ALIAS,
|
||||||
TRANSACTION_VALID_INVALID_SIGN
|
TRANSACTION_VALID_INVALID_SIGN
|
||||||
};
|
};
|
||||||
|
|||||||
@ -108,7 +108,7 @@ namespace model {
|
|||||||
|
|
||||||
if (mProtoCreation.receiver().pubkey().size() != KeyPairEd25519::getPublicKeySize()) {
|
if (mProtoCreation.receiver().pubkey().size() != KeyPairEd25519::getPublicKeySize()) {
|
||||||
addError(new Error(function_name, "receiver pubkey has invalid size"));
|
addError(new Error(function_name, "receiver pubkey has invalid size"));
|
||||||
return TRANSCATION_VALID_INVALID_PUBKEY;
|
return TRANSACTION_VALID_INVALID_PUBKEY;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: check creation amount from last 3 month from node server
|
// TODO: check creation amount from last 3 month from node server
|
||||||
|
|||||||
@ -176,11 +176,15 @@ namespace model {
|
|||||||
}
|
}
|
||||||
if (receiver_pubkey->size() != KeyPairEd25519::getPublicKeySize()) {
|
if (receiver_pubkey->size() != KeyPairEd25519::getPublicKeySize()) {
|
||||||
addError(new Error(function_name, "invalid size of receiver pubkey"));
|
addError(new Error(function_name, "invalid size of receiver pubkey"));
|
||||||
return TRANSCATION_VALID_INVALID_PUBKEY;
|
return TRANSACTION_VALID_INVALID_PUBKEY;
|
||||||
}
|
}
|
||||||
if (sender->pubkey().size() != KeyPairEd25519::getPublicKeySize()) {
|
if (sender->pubkey().size() != KeyPairEd25519::getPublicKeySize()) {
|
||||||
addError(new Error(function_name, "invalid size of sender pubkey"));
|
addError(new Error(function_name, "invalid size of sender pubkey"));
|
||||||
return TRANSCATION_VALID_INVALID_PUBKEY;
|
return TRANSACTION_VALID_INVALID_PUBKEY;
|
||||||
|
}
|
||||||
|
if(0 == memcmp(sender->pubkey().data(), receiver_pubkey->data(), KeyPairEd25519::getPublicKeySize())) {
|
||||||
|
addError(new Error(function_name, "sender and receiver are the same"));
|
||||||
|
return TRANSACTION_VALID_INVALID_PUBKEY;
|
||||||
}
|
}
|
||||||
return TRANSACTION_VALID_OK;
|
return TRANSACTION_VALID_OK;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user