Provide a timestamp and ASVS version upon updates

hkjels · hkjels · commit 070965ae1e0f · 2025-05-08T08:34:11.000+02:00
Also added an option to set recurring tasks.
diff --git a/resources/public/css/main.css b/resources/public/css/main.css
@@ -591,6 +591,18 @@ header a:hover {
             }
         }
     }
+    menu {
+        display: flex;
+        padding: 0;
+        flex-direction: row;
+        gap: 1em;
+        div {
+            display: flex;
+        }
+        .Recurrence-input {
+            transform: translateY(-0.4em);
+        }
+    }
 }
 .Assessment .item {
     display: flex;
@@ -682,3 +694,21 @@ button.primary {
 strong {
     font-weight: 600;
 }
+
+.Recurrence-input {
+    display: flex;
+    flex-direction: row;
+    opacity: 1;
+    transition: .2s ease;
+    label {
+        opacity: 0.5;
+        font-size: 0.6em;
+    }
+    div {
+        display: flex;
+        flex-direction: column;
+    }
+    &.hide {
+        opacity: 0;
+    }
+}
diff --git a/src/asva/assessments.cljs b/src/asva/assessments.cljs
@@ -1,9 +1,9 @@
 (ns asva.assessments
   (:require
-   [asva.components :refer [highlight progress-indicator]]
+   [asva.components :refer [highlight progress-indicator recurrence-input]]
    [asva.i18n :refer [t]]
    [asva.icons :as icons]
-   [asva.utils :refer [<> <sub dispatch>e e> parse-int slug slug-key]]
+   [asva.utils :refer [<> <sub dispatch>e e> parse-int slug slug-key now]]
    [clojure.edn :as edn]
    [clojure.string :as str]
    [clojure.walk :refer [postwalk]]
@@ -75,22 +75,52 @@
 (re-frame/reg-event-fx
   ::notes
   (fn [{:keys [db]} [_ shortcode notes]]
-    (let [updated-db (assoc-in db [::assessments (slug-key shortcode) :notes] notes)]
+    (let [last-modified (now)
+          updated-db (update-in db [::assessments (slug-key shortcode)]
+                       (fn [assessment]
+                         (merge assessment
+                           {:asvs-version (-> db ::asvs :version)
+                            :notes notes
+                            :last-modified last-modified})))]
       {:db updated-db
        :local-storage [::assessments (get updated-db ::assessments)]})))
 
 (re-frame/reg-event-fx
   ::progress
   (fn [{:keys [db]} [_ shortcode progress]]
     (let [progress (max 0 (min 100 progress))
-          updated-db (assoc-in db [::assessments (slug-key shortcode) :progress] progress)]
+          last-modified (now)
+          updated-db (update-in db [::assessments (slug-key shortcode)]
+                       (fn [assessment]
+                         (merge assessment
+                           {:asvs-version (-> db ::asvs :version)
+                            :progress progress
+                            :last-modified last-modified})))]
       {:db updated-db
        :local-storage [::assessments (get updated-db ::assessments)]})))
 
 (re-frame/reg-event-fx
   ::not-applicable
   (fn [{:keys [db]} [_ shortcode not-applicable]]
-    (let [updated-db (assoc-in db [::assessments (slug-key shortcode) :not-applicable] not-applicable)]
+    (let [last-modified (now)
+          updated-db (update-in db [::assessments (slug-key shortcode)]
+                       (fn [assessment]
+                         (merge assessment
+                           {:asvs-version (-> db ::asvs :version)
+                            :not-applicable not-applicable
+                            :last-modified last-modified})))]
+      {:db updated-db
+       :local-storage [::assessments (get updated-db ::assessments)]})))
+
+(re-frame/reg-event-fx
+  ::recurrence
+  (fn [{:keys [db]} [_ shortcode recurrence]]
+    (let [updated-db (update-in db [::assessments (slug-key shortcode)]
+                       (fn [assessment]
+                         (merge assessment
+                           {:asvs-version (-> db ::asvs :version)
+                            :last-modified (now)
+                            :recurring recurrence})))]
       {:db updated-db
        :local-storage [::assessments (get updated-db ::assessments)]})))
 
@@ -184,11 +214,12 @@
                     (group-by :chapter))]
      (sort-by key items))))
 
-(defn assessment [{:keys [shortcode description progress not-applicable notes cwe nist last-updated]}]
+(defn assessment [{:keys [shortcode description progress not-applicable notes cwe nist last-modified asvs-version]}]
   (let [query (re-frame/subscribe [::query])
+        recurrence-input? (reagent/atom false)
         editing? (reagent/atom false)
         note (reagent/atom notes)]
-    (fn [{:keys [shortcode description progress not-applicable notes cwe nist last-updated] :as tmp}]
+    (fn [{:keys [shortcode description progress not-applicable notes cwe nist last-modified asvs-version]}]
       (let [not-applicable (boolean not-applicable)
             url (str (-> js/location .-host) "/#" shortcode)
             cwe-url (fn [n] (str "https://cwe.mitre.org/data/definitions/" n ".html"))
@@ -209,21 +240,27 @@
                     :title (t :not-applicable)
                     :on-change (dispatch>e [::not-applicable shortcode (not not-applicable)])}]
            [:label {:for (str shortcode "-na")} "n/a"]]]
-	 (when last-updated [:small.last-updated.badge (t :last-updated last-updated)])
+	 (when last-modified
+           [:small.last-modified.badge {:title (t :registered-version asvs-version (js/Date. last-modified))}
+            (t :last-modified (js/Date. last-modified))])
 	 [:p.description (highlight description @query)]
 	 [:div.horizontal
 	  (when (some? cwe) [:a.badge.warning {:target :_blank :title :cwe :rel :noopener :href (cwe-url cwe)} cwe])
 	  (when (some? nist) [:a.badge {:target :_blank :title :nist :rel :noopener :href (nist-url nist)} nist])]
+	 [:menu
+          (when-not @editing?
+	    [:button {:title (t :assessment-notes) :on-click (e> (reset! editing? true))} [icons/note]])
+          [:div
+           [:button {:title (t :recurring) :on-click #(swap! recurrence-input? not)} [icons/recurring]]]
+          [recurrence-input {:class [(when-not @recurrence-input? :hide)] :on-change #(re-frame/dispatch [::recurrence shortcode %])}]]
 	 [:div.Markdown
 	  (if @editing?
 	    [:<>
 	     [:textarea {:auto-focus true :placeholder (t :assessment-notes) :value @note :on-change (e> (reset! note value))}]
 	     [:a {:href "https://www.markdownguide.org/basic-syntax/" :target :_blank :rel :noopener}
-	      [icons/markdown {:title (t :markdown-support)}]]]
+	      [icons/markdown {:title (t :markdown-support)}]]
+             [:button.primary {:on-click (dispatch>e (do (reset! editing? false) [::notes shortcode @note]))} "Save"]]
 	    [markdown->hiccup notes])]
-	 (if @editing?
-	   [:button.primary {:on-click (dispatch>e (do (reset! editing? false) [::notes shortcode @note]))} "Save"]
-	   [:button {:title (t :assessment-notes) :on-click (e> (reset! editing? true))} [icons/note]])
 	 [progress-indicator {:width 40
 			      :on-progress (fn [prog] (re-frame/dispatch [::progress shortcode prog]))} progress]]))))
 
diff --git a/src/asva/components.cljs b/src/asva/components.cljs
@@ -4,7 +4,8 @@
    [asva.icons :as icons]
    [asva.utils :refer [->params e>]]
    [clojure.string :as str]
-   [reagent.core :as reagent]))
+   [reagent.core :as reagent]
+   [reagent.core :as r]))
 
 (defn progress-indicator [& args]
   (let [[{:keys [on-progress width]
@@ -128,3 +129,32 @@
              [:div.Upload-message
               [:h1 (t :drop-to-upload)]])]
           body)))
+
+(defn recurrence-input [{:keys [value on-change] :as params}]
+  (let [{:keys [every unit]
+         :or {every 0 unit :month}} value
+        local-state (r/atom {:every every :unit unit})]
+    (fn [{:keys [on-change] :as params}]
+      (let [params (dissoc params :on-change :value)]
+       [:div.Recurrence-input params
+        [:div
+         [:label (t :every)]
+         [:input {:type      :number
+                  :min       0
+                  :size      3
+                  :value     (:every @local-state)
+                  :on-change (fn [e]
+                               (let [v (js/parseInt (.. e -target -value))]
+                                 (swap! local-state assoc :every v)
+                                 (on-change (assoc @local-state :every v))))}]]
+        [:div
+         [:label (t :time-span)]
+         [:select {:value     (name (:unit @local-state))
+                   :on-change (fn [e]
+                                (let [v (keyword (.. e -target -value))]
+                                  (swap! local-state assoc :unit v)
+                                  (on-change (assoc @local-state :unit v))))}
+          [:option {:value :day} "Day"]
+          [:option {:value :week} "Week"]
+          [:option {:value :month} "Month"]
+          [:option {:value :year} "Year"]]]]))))
diff --git a/src/asva/i18n.cljs b/src/asva/i18n.cljs
@@ -90,7 +90,9 @@
     :12-hour (tongue/inst-formatter "{hour12}" inst-strings-en)
     :two-decimals (fn [num] (format-number-en (round-to-decimals num 2)))
     :percent (fn [num] (str (format-number-en (round-to-decimals num 2)) "%"))
-    :last-updated (fn [d] (str "Last updated " ((tongue/inst-formatter "{month-long} {day}, {year}" inst-strings-en) d)))
+    :last-modified (fn [d] (str "Last modified " ((tongue/inst-formatter "{month-long} {day}, {year}" inst-strings-en) d)))
+    :registered-version "Registered with ASVS v.{1} at {2}"
+    :recurring "Recurring"
 
     :main-title  "Welcome to Our ASVA Assessment Page"
     :preface-1 "Our mission is to integrate robust security practices into our services. This assessment, aligned with "
@@ -115,6 +117,8 @@
     :file-upload-help "Don't have a file yet?"
     :file-upload-download "Download the latest ASVS from OWASP"
 
+    :every "Every"
+    :time-span "Time span"
     :search "Search..."
     :copy-location "Copy location of anchor to your clipboard"
     :level "Level {1}"
@@ -140,7 +144,7 @@
     :failed-reading "Error reading the ASVS file. Check if the file exists, is accessible, and is in JSON format."}
 
    :nb
-   {:last-updated (fn [d] (str "Sist oppdatert " ((tongue/inst-formatter "{day}. {month-long} {year}" inst-strings-no) d)))
+   {:last-modified (fn [d] (str "Sist oppdatert " ((tongue/inst-formatter "{day}. {month-long} {year}" inst-strings-no) d)))
     :main-title "Velkommen til vår ASVA-vurderingsside"
     :preface-1 "Vår misjon er å integrere robuste sikkerhetspraksiser i våre tjenester. Denne vurderingen, i tråd med "
     :preface-link-1 "OWASPs ASVA-retningslinjer"
@@ -189,7 +193,7 @@
 
 
    :nl
-   {:last-updated (fn [d] (str "Laatst bijgewerkt " ((tongue/inst-formatter "{day} {month-long} {year}" inst-strings-nl) d)))
+   {:last-modified (fn [d] (str "Laatst bijgewerkt " ((tongue/inst-formatter "{day} {month-long} {year}" inst-strings-nl) d)))
     :main-title "Welkom op onze ASVA-beoordelingspagina"
     :preface-1 "Onze missie is om robuuste beveiligingspraktijken te integreren in onze services. Deze beoordeling, in lijn met "
     :preface-link-1 "OWASP's ASVA-richtlijnen"
@@ -227,7 +231,7 @@
     :config "Configuratie"}
 
    :pt
-   {:last-updated (fn [d] (str "Última atualização " ((tongue/inst-formatter "{day} de {month-long} de {year}" inst-strings-pt) d)))
+   {:last-modified (fn [d] (str "Última atualização " ((tongue/inst-formatter "{day} de {month-long} de {year}" inst-strings-pt) d)))
     :main-title "Bem-vindo à nossa Página de Avaliação ASVA"
     :preface-1 "Nossa missão é integrar práticas de segurança robustas aos nossos serviços. Esta avaliação, alinhada com "
     :preface-link-1 "as diretrizes da ASVA da OWASP"
@@ -265,7 +269,7 @@
     :config "Configuração"}
 
    :es
-   {:last-updated (fn [d] (str "Última actualización " ((tongue/inst-formatter "{day} de {month-long} de {year}" inst-strings-es) d)))
+   {:last-modified (fn [d] (str "Última actualización " ((tongue/inst-formatter "{day} de {month-long} de {year}" inst-strings-es) d)))
     :main-title "Bienvenido a nuestra página de evaluación ASVA"
     :preface-1 "Nuestra misión es integrar prácticas de seguridad robustas en nuestros servicios. Esta evaluación, alineada con "
     :preface-link-1 "las pautas de ASVA de OWASP"
@@ -303,7 +307,7 @@
     :config "Configuración"}
 
    :ko
-   {:last-updated (fn [d] (str "마지막 업데이트 " ((tongue/inst-formatter "{year}년 {month-long} {day}일" inst-strings-ko) d)))
+   {:last-modified (fn [d] (str "마지막 업데이트 " ((tongue/inst-formatter "{year}년 {month-long} {day}일" inst-strings-ko) d)))
     :main-title "우리 ASVA 평가 페이지에 오신 것을 환영합니다"
     :preface-1 "우리의 사명은 우리 서비스에 강력한 보안 관행을 통합하는 것입니다. 이 평가는"
     :preface-link-1 "OWASP의 ASVA 가이드라인"
diff --git a/src/asva/icons.cljs b/src/asva/icons.cljs
@@ -70,3 +70,7 @@
          [:path {:d "M17 21h-10a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z"}]
          [:path {:d "M12 11v6"}]
          [:path {:d "M9.5 13.5l2.5 -2.5l2.5 2.5"}]]))
+
+(defn recurring [params]
+  (into [svg (merge-with into {:class [:recurring]} params)]
+    [[:path {:stroke-linecap "round" :stroke-linejoin "round" :d "M19.5 12c0-1.232-.046-2.453-.138-3.662a4.006 4.006 0 0 0-3.7-3.7 48.678 48.678 0 0 0-7.324 0 4.006 4.006 0 0 0-3.7 3.7c-.017.22-.032.441-.046.662M19.5 12l3-3m-3 3-3-3m-12 3c0 1.232.046 2.453.138 3.662a4.006 4.006 0 0 0 3.7 3.7 48.656 48.656 0 0 0 7.324 0 4.006 4.006 0 0 0 3.7-3.7c.017-.22.032-.441.046-.662M4.5 12l3 3m-3-3-3 3"}]]))
diff --git a/src/asva/utils.cljc b/src/asva/utils.cljc
@@ -8,16 +8,16 @@
 
 (defn assoc-event-db
   "Associates a value into the given re-frame app-db at a specified path.
-  
+
   Takes a re-frame `db` and `args`, where the last element of `args`
   is the value to associate, and the remaining elements define the
   nested keys at which to place that value.
-  
+
   Usage:
   (re-frame/reg-event-db ::some-event assoc-event-db)
-  
+
   Example:
-  If `db` is {:a {:b {:c 0}}}, and `args` is [:a :b :c 1], 
+  If `db` is {:a {:b {:c 0}}}, and `args` is [:a :b :c 1],
   the resulting db will be {:a {:b {:c 1}}}."
   [db args] (assoc-in db (pop args) (peek args)))
 
@@ -93,7 +93,7 @@
                ~'inner-html (.-innerHTML ~'target)]
            ~@body)))))
 
-;; REVIEW I’m reconsidering the utility of `dispatch>e`. 
+;; REVIEW I’m reconsidering the utility of `dispatch>e`.
 ;;      | While `e>` is beneficial for general event-handler scenarios, `dispatch>e` is
 ;;      | limited to situations where a re-frame event is dispatched. This could be
 ;;      | efficiently handled with `(e> (dispatch [:key]))`, provided we adhere to the
@@ -133,5 +133,7 @@
 (defn key->prop [key]
   (kebab-to-pascal (name key)))
 
+#?(:cljs (defn now [] (.toISOString (js/Date.))))
+
 #?(:cljs (defn ->clj [x] (bean/->clj x :prop->key prop->key :key->prop key->prop)))
 #?(:cljs (defn ->js [x] (bean/->js x :prop->key prop->key :key->prop key->prop)))
