Fix escaping some cases and add unittest (#619)

metsma · web-flow · commit d107ee57fe60 · 2024-08-27T15:46:28.000+03:00
IB-7996

Signed-off-by: Raul Metsma &lt;raul@metsma.ee&gt;
diff --git a/src/crypto/X509Crypto.cpp b/src/crypto/X509Crypto.cpp
@@ -151,7 +151,7 @@ int X509Crypto::compareIssuerToString(string_view name) const
                 value[pos] = char(result);
                 value.erase(pos + 1, 2);
             }
-            else if(escape.find(value[pos+1]) == string::npos)
+            else if(escape.find(value[pos+1]) != string::npos)
                 value.erase(pos, 1);
         }
 
diff --git a/test/data/comma.crt b/test/data/comma.crt
@@ -0,0 +1,10 @@
+-----BEGIN CERTIFICATE-----
+MIIBcjCB+QIJAKIsqQxqAGX3MAoGCCqGSM49BAMCMCMxCzAJBgNVBAYTAkVFMRQw
+EgYDVQQDDAt0ZXN0LCBjb21tYTAeFw0yNDA4MjcwODM4MDlaFw0yNTA4MjcwODM4
+MDlaMCMxCzAJBgNVBAYTAkVFMRQwEgYDVQQDDAt0ZXN0LCBjb21tYTB2MBAGByqG
+SM49AgEGBSuBBAAiA2IABKoUm0pDszqGu4HyjABAYB0FhAgEN+G1QNEEEXjz0jRK
+rlu7PqV3Bj+4Wz222KBUpViaZZdTuZFLDbEL7legmfNMeOiQK2SQiYRrclFhZVaE
+laqSW0BNqI6wIevp/IgSmjAKBggqhkjOPQQDAgNoADBlAjBFyjog1pDn0J5azKuK
+AwTqnTVYxWgeNsYpfgzQ1BYs9jEs/x/FoEgRX7sqeL9TCksCMQC6CG34jBdM3stY
+1czLqKJjqRgZ9yg4wSgPABHYICjTW0TfuCTPLa7pMlL6mrWeAhg=
+-----END CERTIFICATE-----
diff --git a/test/libdigidocpp_boost.cpp b/test/libdigidocpp_boost.cpp
@@ -159,6 +159,8 @@ BOOST_AUTO_TEST_CASE(parameters)
 
     X509Crypto test(X509Cert("test.crt", X509Cert::Pem));
     BOOST_CHECK_EQUAL(test.compareIssuerToString("CN=\\\"test\\\""), 0);
+    X509Crypto comma(X509Cert("comma.crt", X509Cert::Pem));
+    BOOST_CHECK_EQUAL(comma.compareIssuerToString("CN=test\\, comma"), 0);
 }
 BOOST_AUTO_TEST_SUITE_END()
 

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ int X509Crypto::compareIssuerToString(string_view name) const`
`151`	`151`	`value[pos] = char(result);`
`152`	`152`	`value.erase(pos + 1, 2);`
`153`	`153`	`}`
`154`		`- else if(escape.find(value[pos+1]) == string::npos)`
	`154`	`+ else if(escape.find(value[pos+1]) != string::npos)`
`155`	`155`	`value.erase(pos, 1);`
`156`	`156`	`}`
`157`	`157`
Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,8 @@ BOOST_AUTO_TEST_CASE(parameters)`
`159`	`159`
`160`	`160`	`X509Crypto test(X509Cert("test.crt", X509Cert::Pem));`
`161`	`161`	`BOOST_CHECK_EQUAL(test.compareIssuerToString("CN=\\\"test\\\""), 0);`
	`162`	`+ X509Crypto comma(X509Cert("comma.crt", X509Cert::Pem));`
	`163`	`+ BOOST_CHECK_EQUAL(comma.compareIssuerToString("CN=test\\, comma"), 0);`
`162`	`164`	`}`
`163`	`165`	`BOOST_AUTO_TEST_SUITE_END()`
`164`	`166`