Last modified by Agnease on 2026/06/16 17:18

From version 16.40
edited by Agnease
on 2026/06/16 16:57
Change comment: There is no comment for this version
To version 16.57
edited by Agnease
on 2026/06/16 17:18
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -3,36 +3,113 @@
3 3   #set ($statusCode = 400)
4 4   #set ($message = 'The request could not be sent. Please try again or contact Agnease by email at alex@agnease.com.')
5 5  
6 + #set ($className = 'Agnease.Code.ContactRequest.ContactRequestClass')
7 + #set ($allowedProperties = [
8 + 'scope',
9 + 'alreadyUseXWiki',
10 + 'name',
11 + 'email',
12 + 'hosting',
13 + 'customDevelopment',
14 + 'timeline',
15 + 'users'
16 + ])
17 +
6 6   #set ($name = '')
7 7   #set ($email = '')
20 + #set ($scope = '')
8 8   #set ($contactWebsite = '')
22 + #set ($startedAtRaw = '')
9 9  
24 + ## Extract only the values we need for validation.
10 10   #foreach ($parameterName in $request.parameterNames)
11 11   #set ($propertyParts = $parameterName.split('_0_'))
12 12   #if ($propertyParts.size() > 1)
13 - #set ($propertyName = $parameterName.split('_0_')[1])
28 + #set ($propertyName = $propertyParts[1])
29 + #set ($propertyValue = $stringtool.trim($request.get($parameterName)))
30 +
14 14   #if ($propertyName == 'name')
15 - #set ($name = $stringtool.trim($request.get($parameterName)))
32 + #set ($name = $propertyValue)
16 16   #elseif ($propertyName == 'email')
17 - #set ($email = $stringtool.trim($request.get($parameterName)))
34 + #set ($email = $propertyValue)
35 + #elseif ($propertyName == 'scope')
36 + #set ($scope = $propertyValue)
18 18   #elseif ($propertyName == 'contactWebsite')
19 - #set ($contactWebsite = $stringtool.trim($request.get($parameterName)))
38 + #set ($contactWebsite = $propertyValue)
39 + #elseif ($propertyName == 'contactStartedAt')
40 + #set ($startedAtRaw = $propertyValue)
20 20   #end
21 21   #end
22 22   #end
23 23  
24 - #if ("$!contactWebsite.trim()" != '')
25 - #set ($statusCode = 400)
26 - #set ($message = 'The request could not be sent. Please try again or contact Agnease by email.')
27 - #elseif ("$!name" == '' && "$!email" == '')
28 - #set ($statusCode = 400)
45 + #set ($spamScore = 0)
46 +
47 + ## Honeypot: real users should never fill this field.
48 + #if ("$!contactWebsite" != '')
49 + #set ($spamScore = $spamScore + 5)
50 + #end
51 +
52 + ## Submission timing check.
53 + #if ("$!startedAtRaw" == '')
54 + ## The field is expected from the real form, so missing it is suspicious.
55 + #set ($spamScore = $spamScore + 2)
56 + #else
57 + #set ($startedAt = $numbertool.toNumber($startedAtRaw))
58 + #if ("$!startedAt" == '')
59 + #set ($spamScore = $spamScore + 2)
60 + #else
61 + #set ($now = $datetool.systemDate.time)
62 + #set ($elapsed = $now - $startedAt)
63 +
64 + ## Reject very fast submissions.
65 + #if ($elapsed > 0 && $elapsed < 10000)
66 + #set ($spamScore = $spamScore + 3)
67 + #end
68 + #end
69 + #end
70 +
71 + ## Random-looking name: long single token.
72 + #if ($name.length() >= 16 && !$name.contains(' '))
73 + #set ($spamScore = $spamScore + 2)
74 + #end
75 +
76 + ## Random-looking project description: long single token.
77 + #if ($scope.length() >= 12 && !$scope.contains(' '))
78 + #set ($spamScore = $spamScore + 2)
79 + #end
80 +
81 + ## Suspicious email local part with many dots and tiny fragments.
82 + #set ($emailParts = $email.split('@'))
83 + #if ($emailParts.size() == 2)
84 + #set ($localPart = $emailParts[0])
85 + #set ($localFragments = $localPart.split('\.'))
86 + #set ($dotCount = $localFragments.size() - 1)
87 + #set ($oneCharFragments = 0)
88 +
89 + #foreach ($fragment in $localFragments)
90 + #if ($fragment.length() == 1)
91 + #set ($oneCharFragments = $oneCharFragments + 1)
92 + #end
93 + #end
94 +
95 + #if ($dotCount >= 4 && $oneCharFragments >= 3)
96 + #set ($spamScore = $spamScore + 2)
97 + #end
98 + #else
99 + #set ($spamScore = $spamScore + 2)
100 + #end
101 +
102 + ## Human-facing validation.
103 + #if ("$!name" == '' && "$!email" == '')
29 29   #set ($message = 'Please enter your name and email.')
30 30   #elseif ("$!name" == '')
31 - #set ($statusCode = 400)
32 32   #set ($message = 'Please enter your name.')
33 33   #elseif ("$!email" == '')
34 - #set ($statusCode = 400)
35 35   #set ($message = 'Please enter your email address.')
109 + #elseif ("$!scope" == '' || $scope.length() < 30)
110 + #set ($message = 'Please add a short description of your XWiki project, question or issue.')
111 + #elseif ($spamScore >= 3)
112 + #set ($message = 'The request could not be sent. Please add a clearer description of your XWiki request or contact Agnease by email.')
36 36   #else
37 37   #try('contactException')
38 38   #set ($now = $datetool.get('yyyyMMddHHmm'))
... ... @@ -39,11 +39,18 @@
39 39   #set ($random = $mathtool.random(100000, 999999))
40 40   #set ($uniqueName = "ContactRequest-${now}-${random}")
41 41   #set ($contactRequestDoc = $xwiki.getDocumentAsAuthor('ContactRequests.' + $uniqueName))
42 - #set ($contactRequestObj = $contactRequestDoc.getObject('Agnease.Code.ContactRequest.ContactRequestClass', true))
119 + #set ($contactRequestObj = $contactRequestDoc.getObject($className, true))
43 43  
121 + ## Save only known ContactRequest fields.
44 44   #foreach ($parameterName in $request.parameterNames)
45 - #set ($propertyName = $parameterName.split('_0_')[1])
46 - #set ($discard = $contactRequestObj.set($propertyName, $request.get($parameterName)))
123 + #set ($propertyParts = $parameterName.split('_0_'))
124 + #if ($propertyParts.size() > 1)
125 + #set ($propertyName = $propertyParts[1])
126 +
127 + #if ($allowedProperties.contains($propertyName))
128 + #set ($discard = $contactRequestObj.set($propertyName, $request.get($parameterName)))
129 + #end
130 + #end
47 47   #end
48 48  
49 49   #set ($discard = $contactRequestDoc.saveAsAuthor())
... ... @@ -119,7 +119,7 @@
119 119   tabindex="-1"
120 120   />
121 121   </div>
122 - <input type="hidden" name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactStartedAt" value="$datetool.getsystemDate.time" />
206 + <input type="hidden" name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactStartedAt" value="$datetool.systemDate.time" />
123 123   <input id="contactSubmit" type="submit" class="btn btn-primary" value="Send my request">
124 124   </form>
125 125   #end