fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(submission): ignore extension case within zips

Browse Source
This commit is contained in:
Gregor Kleen 2019-11-04 13:29:18 +01:00
parent 5f04593b30
commit f8442cfea9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Handler/Utils/Submission.hs
View File

@ -50,6 +50,8 @@ import Text.Hamlet (ihamletFile)
import qualified Control.Monad.Catch as E (Handler(..)) import qualified Control.Monad.Catch as E (Handler(..))
import qualified Data.CaseInsensitive as CI
data AssignSubmissionException = NoCorrectors data AssignSubmissionException = NoCorrectors
| NoCorrectorsByProportion | NoCorrectorsByProportion
| SubmissionsNotFound (NonNull (Set SubmissionId)) | SubmissionsNotFound (NonNull (Set SubmissionId))
@ -428,7 +430,7 @@ sinkSubmission userId mExists isUpdate = do
, Just (map unpack . Set.toList . toNullable -> exts) <- extensionRestriction , Just (map unpack . Set.toList . toNullable -> exts) <- extensionRestriction
= Conduit.mapM $ \x -> if = Conduit.mapM $ \x -> if
| Left File{..} <- x | Left File{..} <- x
, none (`isExtensionOf` fileTitle) exts , none ((flip isExtensionOf `on` CI.foldCase) fileTitle) exts
, isn't _Nothing fileContent -- File record is not a directory, we don't care about those , isn't _Nothing fileContent -- File record is not a directory, we don't care about those
-> throwM $ InvalidFileTitleExtension fileTitle -> throwM $ InvalidFileTitleExtension fileTitle
| otherwise | otherwise