Removed camelCase assumption when validating spam-filtered form field…

… names
ixnas · Nov 4, 2024 · 2bdb049 · 2bdb049
1 parent 47c04a9
commit 2bdb049
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 20 deletions.
diff --git a/Ixnas.AltchaNet.AspNetCoreExample/Views/Home/Index.cshtml b/Ixnas.AltchaNet.AspNetCoreExample/Views/Home/Index.cshtml
@@ -51,16 +51,16 @@
                             <h4 class="card-heading mb-3">ALTCHA API - Spam filtered</h4>
                             <form action="/verifyApiSpamFiltered" method="post">
                                 <div class="mb-3">
-                                    <label class="form-label" for="email">E-mail</label>
-                                    <input class="form-control" id="email" name="email" type="text"/>
+                                    <label class="form-label" for="Email">E-mail</label>
+                                    <input class="form-control" id="Email" name="Email" type="text"/>
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label" for="something">Something</label>
-                                    <input class="form-control" id="something" name="something" type="text"/>
+                                    <label class="form-label" for="Something">Something</label>
+                                    <input class="form-control" id="Something" name="Something" type="text"/>
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label" for="text">Text</label>
-                                    <input class="form-control" id="text" name="text" type="text"/>
+                                    <label class="form-label" for="Text">Text</label>
+                                    <input class="form-control" id="Text" name="Text" type="text"/>
                                 </div>
                                 <altcha-widget
                                     challengeurl="https://eu.altcha.org/api/v1/challenge?apiKey=@(Model.ApiKey)"

diff --git a/Ixnas.AltchaNet.Tests/Simulations/AltchaApiSimulation.cs b/Ixnas.AltchaNet.Tests/Simulations/AltchaApiSimulation.cs
@@ -86,10 +86,7 @@ public string GenerateSpamFiltered<T>(T form,
                                                      && property.Name != altchaPropertyName);
             var propertyDictionary = formProperties.Select(property => new
                                                    {
-                                                       Key = property.Name[0]
-                                                                     .ToString()
-                                                                     .ToLower()
-                                                             + property.Name.Substring(1),
+                                                       Key = property.Name,
                                                        Value = (property.GetValue(form) as string)?.Trim()
                                                    })
                                                    .Where(property => !string.IsNullOrWhiteSpace(

diff --git a/Ixnas.AltchaNet.Tests/Simulations/AltchaFrontEndSimulation.cs b/Ixnas.AltchaNet.Tests/Simulations/AltchaFrontEndSimulation.cs
@@ -33,7 +33,7 @@ public AltchaFrontEndSimulationResult Run(AltchaChallenge altchaChallenge,
                                                   Func<string, string> malformSaltFn = null,
                                                   Func<int> replaceSecretNumberFn = null,
                                                   Func<string> replaceAlgorithmFn = null)
-#pragma warning restore CA1822)
+#pragma warning restore CA1822
         {
             using (var sha = SHA256.Create())
             {

diff --git a/Ixnas.AltchaNet/Internal/SpamFilter/SpamFilterValidator.cs b/Ixnas.AltchaNet/Internal/SpamFilter/SpamFilterValidator.cs
@@ -139,10 +139,7 @@ private static Form ParseForm<T>(T form, Expression<Func<T, string>> altchaSelec
                                           property.Name != altchaPropertyName)
                                .Select(property => new Form.FormField
                                {
-                                   Key = property.Name[0]
-                                                 .ToString()
-                                                 .ToLower()
-                                         + property.Name.Substring(1),
+                                   Key = property.Name,
                                    Value = (property.GetValue(form) as string)?.Trim()
                                })
                                .Where(property => !string.IsNullOrWhiteSpace(property.Value))
@@ -229,7 +226,7 @@ private async static Task<Result<SpamFilteredAltcha>> ChallengeIsNew(IAltchaChal
             var isValid = _clock.UtcNow < timestamp;
             if (!isValid)
                 return Result<(SpamFilteredAltcha, SpamFilterVerificationData)>.Fail(ErrorCode
-                    .FormSubmissionExpired);
+                             .FormSubmissionExpired);
 
             return Result<(SpamFilteredAltcha, SpamFilterVerificationData)>.Ok((altcha, verificationData));
         }
@@ -248,18 +245,18 @@ private async static Task<Result<SpamFilteredAltcha>> ChallengeIsNew(IAltchaChal
             if (!fieldsToHash.Select(field => field.Key)
                              .SequenceEqual(fieldNames))
                 return Result<(SpamFilteredAltcha, SpamFilterVerificationData)>.Fail(ErrorCode
-                    .FormFieldsDontMatch);
+                             .FormFieldsDontMatch);
 
             var combinedFields = string.Join("\n", fieldsToHash.Select(field => field.Value));
             var calculatedHash =
                 ByteConverter.GetHexStringFromBytes(_cryptoAlgorithm.Hash(ByteConverter
-                                                        .GetByteArrayFromUtf8String(combinedFields)));
+                                                                 .GetByteArrayFromUtf8String(combinedFields)));
 
             var fieldsHash = verificationData.FieldHash;
             var fieldValuesMatch = calculatedHash == fieldsHash;
             if (!fieldValuesMatch)
                 return Result<(SpamFilteredAltcha, SpamFilterVerificationData)>.Fail(ErrorCode
-                    .FormFieldValuesDontMatch);
+                             .FormFieldValuesDontMatch);
             return Result<(SpamFilteredAltcha, SpamFilterVerificationData)>.Ok((altcha, verificationData));
         }
 

diff --git a/README.md b/README.md
@@ -252,7 +252,6 @@ The `ValidationError` property contains more details on why the validation faile
 The result's `PassedSpamFilter` property tells you whether the form data successfully passed through the spam filter.
 You might want to keep the form submission and mark it as spam in your application for manual approval.
 
-
 ## Solving challenges
 
 ### Set up