From 66f5e96eca4cbcb6cb092092b1b1b069ce30f159 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gregor.kleen@ifi.lmu.de>
Date: Fri, 30 Jul 2021 17:05:50 +0200
Subject: [PATCH] fix(submissions): don't leak info from corrected versions of
 files

---
 src/Handler/Submission/Helper.hs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Handler/Submission/Helper.hs b/src/Handler/Submission/Helper.hs
index 229cd8838..3d6c8c579 100644
--- a/src/Handler/Submission/Helper.hs
+++ b/src/Handler/Submission/Helper.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fno-warn-incomplete-uni-patterns #-}
-
 module Handler.Submission.Helper
   ( submissionHelper
   ) where
@@ -554,11 +552,11 @@ submissionHelper tid ssh csh shn mcid = do
   let colonnadeFiles :: _ -> Colonnade Sortable _ (DBCell (HandlerFor UniWorX) ())
       colonnadeFiles cid = mconcat $ catMaybes
         [ Just . sortable (Just "path") (i18nCell MsgTableFileTitle) $ \(mOrig, mCorr) -> let
-              Just fileTitle' = submissionFileTitle . entityVal <$> (mOrig <|> mCorr)
+              fileTitle'' = submissionFileTitle . entityVal <$> (mOrig <|> mCorr)
               origIsFile = fmap (isJust . submissionFileContent . entityVal) mOrig
               corrIsFile = fmap (isJust . submissionFileContent . entityVal) mCorr
-              Just isFile = origIsFile <|> corrIsFile
-            in if
+              isFile' = origIsFile <|> corrIsFile
+            in maybeCell ((,) <$> fileTitle'' <*> isFile') $ \(fileTitle', isFile) -> if
               | Just True <- origIsFile -> anchorCell (subDownloadLink cid SubmissionOriginal fileTitle') [whamlet|#{fileTitle'}|]
               | otherwise               -> textCell $ bool (<> "/") id isFile fileTitle'
         , guardOn showCorrection . sortable (toNothing "state") (i18nCell MsgTableCorState) $ \(_, mCorr) -> case mCorr of
@@ -569,8 +567,8 @@ submissionHelper tid ssh csh shn mcid = do
         , Just . sortable (Just "time") (i18nCell MsgTableFileModified) $ \(mOrig, mCorr) -> let
               origTime = submissionFileModified . entityVal <$> mOrig
               corrTime = submissionFileModified . entityVal <$> mCorr
-              Just fileTime = (max <$> origTime <*> corrTime) <|> origTime <|> corrTime
-            in dateTimeCell fileTime
+              fileTime = (max <$> origTime <*> corrTime) <|> origTime <|> corrTime
+            in maybeCell fileTime dateTimeCell
         ]
       subDownloadLink cid sft fileTitle' = CSubmissionR tid ssh csh shn cid $ SubDownloadR sft fileTitle'
       submissionFiles :: _ -> _ -> E.SqlQuery _
@@ -579,6 +577,7 @@ submissionHelper tid ssh csh shn mcid = do
          E.&&. sf1 E.?. SubmissionFileSubmission E.==. sf2 E.?. SubmissionFileSubmission
          E.&&. sf1 E.?. SubmissionFileId E.!=. sf2 E.?. SubmissionFileId
          E.&&. sf2 E.?. SubmissionFileIsDeletion E.==. E.val (Just False)
+         E.&&. E.val showCorrection -- Do not correlate files if we don't show correction; together with `may-access` this treats corrected files like they literally don't exist
 
         E.where_ $ (sf1 E.?. SubmissionFileIsUpdate E.==. E.val (Just False) E.||. E.isNothing (sf1 E.?. SubmissionFileIsUpdate))
              E.&&. (sf2 E.?. SubmissionFileIsUpdate E.==. E.val (Just True)  E.||. E.isNothing (sf2 E.?. SubmissionFileIsUpdate))