Skip to content

Commit

Permalink
Merge pull request #871 from tomasbrod/removeacidtestoverflow
Browse files Browse the repository at this point in the history 
Remove AcidTest and bunch others
  • Loading branch information
@denravonska
denravonska authored Mar 4, 2018
2 parents 73d00d9 + 680d37c commit 6fb2c7e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 243 deletions.
128 changes: 11 additions & 117 deletions src/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,8 @@ int64_t nLastLoadAdminMessages = 0;
int64_t nLastGRCtallied = 0;
int64_t nLastCleaned = 0;


extern bool IsCPIDValidv3(std::string cpidv2, bool allow_investor);

std::string DefaultOrg();
std::string DefaultOrgKey(int key_length);

double MintLimiter(double PORDiff,int64_t RSA_WEIGHT,std::string cpid,int64_t locktime);
double GetLastPaymentTimeByCPID(std::string cpid);
extern double CoinToDouble(double surrogate);
Expand Down Expand Up @@ -6151,54 +6147,6 @@ bool static AlreadyHave(CTxDB& txdb, const CInv& inv)
}


bool AcidTest(std::string precommand, std::string acid, CNode* pfrom)
{
std::vector<std::string> vCommand = split(acid,",");
if (vCommand.size() >= 6)
{
std::string sboinchashargs = DefaultOrgKey(12); //Use 12 characters for inter-client communication
std::string nonce = vCommand[0];
std::string command = vCommand[1];
std::string hash = vCommand[2];
std::string org = vCommand[3];
std::string pub_key_prefix = vCommand[4];
std::string bhrn = vCommand[5];
std::string grid_pass = vCommand[6];
std::string grid_pass_decrypted = AdvancedDecryptWithSalt(grid_pass,sboinchashargs);

if (grid_pass_decrypted != bhrn+nonce+org+pub_key_prefix)
{
if (fDebug10) printf("Decrypted gridpass != hashed message");
nonce.clear();
command.clear();
}

std::string pw1 = RetrieveMd5(nonce+","+command+","+org+","+pub_key_prefix+","+sboinchashargs);

if (precommand=="aries")
{
//pfrom->securityversion = pw1;
}
if (fDebug10) printf(" Nonce %s,comm %s,hash %s,pw1 %s \r\n",nonce.c_str(),command.c_str(),hash.c_str(),pw1.c_str());
if (false && hash != pw1)
{
//2/16 18:06:48 Acid test failed for 192.168.1.4:32749 1478973994,encrypt,1b089d19d23fbc911c6967b948dd8324,windows if (fDebug) printf("Acid test failed for %s %s.",NodeAddress(pfrom).c_str(),acid.c_str());
double punishment = GetArg("-punishment", 10);
pfrom->Misbehaving(punishment);
return false;
}
return true;
}
else
{
if (fDebug2) printf("Message corrupted. Node %s partially banned.",NodeAddress(pfrom).c_str());
pfrom->Misbehaving(1);
return false;
}
return true;
}




// The message start string is designed to be unlikely to occur in normal data.
Expand Down Expand Up @@ -6252,7 +6200,7 @@ bool VerifyExplainMagnitudeResponse()
msNeuralResponse.clear();

return dMag != 0;
}
}

bool SecurityTest(CNode* pfrom, bool acid_test)
{
Expand All @@ -6264,7 +6212,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
{
RandAddSeedPerfmon();
if (fDebug10)
printf("received: %s (%" PRIszu " bytes)\n", strCommand.c_str(), vRecv.size());
printf("received: %s from %s (%" PRIszu " bytes)\n", strCommand.c_str(), pfrom->addrName.c_str(), vRecv.size());
if (mapArgs.count("-dropmessagestest") && GetRand(atoi(mapArgs["-dropmessagestest"])) == 0)
{
printf("dropmessagestest DROPPING RECV MESSAGE\n");
Expand Down Expand Up @@ -6300,40 +6248,16 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
std::string acid = "";
vRecv >> pfrom->nVersion >> pfrom->boinchashnonce >> pfrom->boinchashpw >> pfrom->cpid >> pfrom->enccpid >> acid >> pfrom->nServices >> nTime >> addrMe;


//Halford - 12-26-2014 - Thwart Hackers
bool ver_valid = AcidTest(strCommand,acid,pfrom);
if (fDebug10) printf("Ver Acid %s, Validity %s ",acid.c_str(),YesNo(ver_valid).c_str());
if (!ver_valid)
{
pfrom->Misbehaving(100);
pfrom->fDisconnect = true;
return false;
}
if (fDebug10)
printf("received aries version %i boinchashnonce %s boinchashpw %s cpid %s enccpid %s acid %s ...\n"
,pfrom->nVersion, pfrom->boinchashnonce.c_str(), pfrom->boinchashpw.c_str()
,pfrom->cpid.c_str(), pfrom->enccpid.c_str(), acid.c_str());

bool unauthorized = false;
double timedrift = std::abs(GetAdjustedTime() - nTime);

if (true)
{
if (timedrift > (8*60))
{
if (fDebug10) printf("Disconnecting unauthorized peer with Network Time so far off by %f seconds!\r\n",(double)timedrift);
unauthorized = true;
}
}
else
if (timedrift > (8*60))
{
if (timedrift > (10*60) && LessVerbose(500))
{
if (fDebug10) printf("Disconnecting authorized peer with Network Time so far off by %f seconds!\r\n",(double)timedrift);
unauthorized = true;
}
}

if (unauthorized)
{
if (fDebug10) printf(" Disconnected unauthorized peer. ");
if (fDebug10) printf("Disconnecting unauthorized peer with Network Time so far off by %f seconds!\n",(double)timedrift);
pfrom->Misbehaving(100);
pfrom->fDisconnect = true;
return false;
Expand Down Expand Up @@ -6393,25 +6317,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
{

// Note: Hacking attempts start in this area
if (false && pfrom->nStartingHeight < (nBestHeight/2) && LessVerbose(1) && !fTestNet)
{
if (fDebug3) printf("Node with low height");
pfrom->fDisconnect=true;
return false;
}
/*
if (pfrom->nStartingHeight < 1 && LessVerbose(980) && !fTestNet)
{
pfrom->Misbehaving(100);
if (fDebug3) printf("Disconnecting possible hacker node. Banned for 24 hours.\r\n");
pfrom->fDisconnect=true;
return false;
}
*/


// End of critical Section

if (pfrom->nStartingHeight < 1 && pfrom->nServices == 0 )
{
Expand Down Expand Up @@ -6478,7 +6383,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
{
if (((CNetAddr)pfrom->addr) == (CNetAddr)addrFrom)
{
if (SecurityTest(pfrom,ver_valid))
if (SecurityTest(pfrom,true))
{
//Dont store the peer unless it passes the test
addrman.Add(addrFrom, addrFrom);
Expand Down Expand Up @@ -6881,15 +6786,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
vRecv >> block >> acid;
uint256 hashBlock = block.GetHash();

bool block_valid = AcidTest(strCommand,acid,pfrom);
if (!block_valid)
{
printf("\r\n Acid test failed for block %s \r\n",hashBlock.ToString().c_str());
return false;
}

if (fDebug10) printf("Acid %s, Validity %s ",acid.c_str(),YesNo(block_valid).c_str());

printf(" Received block %s; ", hashBlock.ToString().c_str());
if (fDebug10) block.print();

Expand Down Expand Up @@ -6995,8 +6891,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
{
uint64_t nonce = 0;
vRecv >> nonce >> acid;
bool pong_valid = AcidTest(strCommand,acid,pfrom);
if (!pong_valid) return false;
//if (fDebug10) printf("pong valid %s",YesNo(pong_valid).c_str());

// Echo the message back with the nonce. This allows for two useful features:
Expand Down Expand Up @@ -7314,8 +7208,8 @@ std::string SerializeBoincBlock(MiningCPID mcpid, int BlockVersion)
int subsidy_places= BlockVersion<8 ? 2 : 8;
if (!IsResearchAgeEnabled(pindexBest->nHeight))
{
mcpid.Organization = DefaultOrg();
mcpid.OrganizationKey = DefaultBlockKey(8); //Only reveal 8 characters
mcpid.Organization = GetArg("-org", "windows");
mcpid.OrganizationKey = "12345678"; //Only reveal 8 characters
}
else
{
Expand Down
81 changes: 6 additions & 75 deletions src/net.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,7 @@ std::string DefaultWalletAddress();
std::string NodeAddress(CNode* pfrom);

extern std::string GetCommandNonce(std::string command);
extern std::string DefaultOrg();
extern std::string DefaultOrgKey(int key_length);
extern std::string DefaultBlockKey(int key_length);

extern std::string OrgId();
std::string DefaultBoincHashArgs();
bool IsCPIDValidv3(std::string cpidv2, bool allow_investor);
extern int nMaxConnections;
std::string ExtractXML(std::string XMLdata, std::string key, std::string key_end);
Expand Down Expand Up @@ -117,17 +112,7 @@ unsigned short GetListenPort()

std::string GetCommandNonce(std::string command)
{
//1-11-2015 Message Attacks - Halford
std::string sboinchashargs = DefaultOrgKey(12);
std::string nonce = ToString(GetAdjustedTime());
std::string org = DefaultOrg();
std::string pub_key_prefix = OrgId();
std::string pw1 = RetrieveMd5(nonce+","+command+","+org+","+pub_key_prefix+","+sboinchashargs);
uint256 boincHashRandNonce = GetRandHash();
std::string bhrn = boincHashRandNonce.GetHex();
std::string grid_pass_encrypted = AdvancedCryptWithSalt(bhrn+nonce+org+pub_key_prefix,sboinchashargs);
std::string sComm = nonce+","+command+","+pw1+","+org+","+pub_key_prefix+","+bhrn+","+grid_pass_encrypted;
return sComm;
return "deprecated,d,d,d,d,d,d";
}


Expand Down Expand Up @@ -679,58 +664,6 @@ void CNode::CloseSocketDisconnect()
}


std::string LegacyDefaultBoincHashArgs()
{
std::string boinc2 = BoincHashMerkleRootNew;
return boinc2;
}


std::string DefaultBoincHashArgs()
{
// (Gridcoin), add support for ProofOfBoinc Node Relay support:
std::string bha = GetArg("-boinchash", "boinchashargs");
if (bha=="boinchashargs") bha = BoincHashWindowsMerkleRootNew;
std::string org = DefaultOrg();
std::string ClientPublicKey = AdvancedDecryptWithSalt(bha,org);
return ClientPublicKey;
}

std::string OrgId()
{
std::string bha = GetArg("-boinchash", "boinchashargs");
if (bha=="boinchashargs") bha = BoincHashWindowsMerkleRootNew;
std::string org = DefaultOrg();
if (bha.length() > 8) org += "-" + bha.substr(0,8);
std::string ClientPublicKey = AdvancedDecryptWithSalt(bha,org);
if (ClientPublicKey.length() > 8) org += "-" + ClientPublicKey.substr(0,5);
return org;
}


std::string DefaultOrg()
{
std::string org = GetArg("-org", "windows");
return org;
}


std::string DefaultOrgKey(int key_length)
{
std::string dok = DefaultBoincHashArgs();
if ((int)dok.length() >= key_length) return dok.substr(0,key_length);
return "";
}


std::string DefaultBlockKey(int key_length)
{
std::string bha = GetArg("-boinchash", "boinchashargs");
if (bha=="boinchashargs") bha = BoincHashWindowsMerkleRootNew;
return (int)bha.length() >= key_length ? bha.substr(0,key_length) : "";
}


void CNode::PushVersion()
{
/// when NTP implemented, change to just nTime = GetAdjustedTime()
Expand All @@ -741,18 +674,16 @@ void CNode::PushVersion()
if (fDebug10) printf("send version message: version %d, blocks=%d, us=%s, them=%s, peer=%s\n",
PROTOCOL_VERSION, nBestHeight, addrMe.ToString().c_str(), addrYou.ToString().c_str(), addr.ToString().c_str());

std::string sboinchashargs = DefaultBoincHashArgs();
uint256 boincHashRandNonce = GetRandHash();
std::string nonce = boincHashRandNonce.GetHex();
std::string pw1 = RetrieveMd5(nonce+","+sboinchashargs);
std::string mycpid = GlobalCPUMiningCPID.cpidv2;
std::string sboinchashargs;
std::string nonce;
std::string pw1;
std::string mycpid = "INVESTOR";
std::string acid = GetCommandNonce("aries");
std::string sGRCAddress = DefaultWalletAddress();

PushMessage("aries", PROTOCOL_VERSION, nonce, pw1,
mycpid, mycpid, acid, nLocalServices, nTime, addrYou, addrMe,
nLocalHostNonce, FormatSubVersion(CLIENT_NAME, CLIENT_VERSION, std::vector<string>()),
nBestHeight, sGRCAddress);
nBestHeight);


}
Expand Down
51 changes: 0 additions & 51 deletions src/rpcblockchain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ MiningCPID GetNextProject(bool bForce);
std::string SerializeBoincBlock(MiningCPID mcpid);
extern std::string TimestampToHRDate(double dtm);

std::string LegacyDefaultBoincHashArgs();
double CoinToDouble(double surrogate);
int64_t GetRSAWeightByCPID(std::string cpid);
double GetUntrustedMagnitude(std::string cpid, double& out_owed);
Expand Down Expand Up @@ -2212,56 +2211,6 @@ Value execute(const Array& params, bool fHelp)
results.push_back(entry);
}

}
else if (sItem == "genorgkey")
{
if (params.size() != 3)
{
entry.push_back(Pair("Error","You must specify a passphrase and organization name"));
results.push_back(entry);
}
else
{
std::string sParam1 = params[1].get_str();
entry.push_back(Pair("Passphrase",sParam1));
std::string sParam2 = params[2].get_str();
entry.push_back(Pair("OrgName",sParam2));

std::string sboinchashargs = LegacyDefaultBoincHashArgs();
if (sParam1 != sboinchashargs)
{
entry.push_back(Pair("Error","Admin must be logged in"));
}
else
{
std::string modulus = sboinchashargs.substr(0,12);
std::string key = sParam2 + "," + AdvancedCryptWithSalt(modulus,sParam2);
entry.push_back(Pair("OrgKey",key));
}
results.push_back(entry);

}

}
else if (sItem == "testorgkey")
{
if (params.size() != 3)
{
entry.push_back(Pair("Error","You must specify an org and public key"));
results.push_back(entry);
}
else
{
std::string sParam1 = params[1].get_str();
entry.push_back(Pair("Org",sParam1));
std::string sParam2 = params[2].get_str();
entry.push_back(Pair("Key",sParam2));
std::string key = sParam1 + "," + AdvancedDecryptWithSalt(sParam2,sParam1);
entry.push_back(Pair("PubKey",key));
results.push_back(entry);

}

}
else if (sItem == "reindex")
{
Expand Down

0 comments on commit 6fb2c7e

Please sign in to comment.