I1179 create zip for submit + CI's

bin/pc2submit

@@ -522,12 +522,15 @@ def do_api_submit():
 
     if team_id :
         jsonSub['team_id'] = team_id
+
+    zip = io.BytesIO()
+
+    with zipfile.ZipFile(zip, 'w', zipfile.ZIP_DEFLATED) as zipf:
+        for filename in filenames:
+            arcname = os.path.basename(filename)
+            zipf.write(filename, arcname)
 
-    jsonSub['files'] = []
-    for filename in filenames :
-        with open(filename, 'rb') as file:
-            data = base64.b64encode(file.read()).decode("utf-8")
-        jsonSub['files'].append({ 'data' : data, 'filename' : filename })
+    jsonSub['files'] = [{ 'data' : base64.b64encode(zip.getvalue()).decode("utf-8"), 'mime' : 'application/zip' }]
 
     logging.debug(f"API Post info: jsonSub: {jsonSub}")
 

src/edu/csus/ecs/pc2/clics/API202306/CLICSContestInfo.java

@@ -107,6 +107,9 @@ public CLICSContestInfo(IInternalContest model, ContestInformation ci) {
             }
         }
         penalty_time = Integer.valueOf(ci.getScoringProperties().getProperty(DefaultScoringAlgorithm.POINTS_PER_NO, "20"));
+        if(ci.getThawed() != null) {
+            scoreboard_thaw_time = Utilities.getIso8601formatterWithMS().format(ci.getThawed());
+        }
         scoreboard_type = "pass-fail";
     }
 

src/edu/csus/ecs/pc2/clics/API202306/ContestService.java

@@ -3,6 +3,7 @@
 
 import java.io.IOException;
 import java.text.ParseException;
+import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Map;
 
@@ -420,11 +421,22 @@ private Response HandleContestThawTime(SecurityContext sc, String contestId, Str
         // thaw time present, validate now
         GregorianCalendar thawTime = getDate(contestId, thawTimeValue);
         if (thawTime != null) {
-            // Set thaw time to this time.
-            // TODO: tell PC2 to thaw the contest at the given time.
-            controller.getLog().log(Log.WARNING, LOG_PREFIX + contestId + ": setting of contest thaw time is not implemented");
-            return Response.status(Status.NOT_MODIFIED).entity("Unable to set contest thaw time to " + thawTime.toString()).build();
+            Date thawDate = thawTime.getTime();
+            String thawStr = Utilities.getIso8601formatterWithMS().format(thawDate);
+            // get the local model's ContestInformation sincd we are modifying the thaw time
+            ContestInformation ci = model.getContestInformation();
+            if (ci != null) {
+                // set the new start date/time into the ContestInformation
+                ci.setThawed(thawDate);
+                // tell the Controller to update the ContestInformation, eg the thaw time in this case
+                controller.updateContestInformation(ci);
+                controller.getLog().log(Log.INFO, LOG_PREFIX + contestId + ": setting contest thaw time to " + thawStr);
+                return Response.ok().entity("Contest thaw time set to " + thawStr).build();
+            }
+            controller.getLog().log(Log.WARNING, LOG_PREFIX + contestId + ": can not get contest information to set thaw time");
+            return Response.status(Status.NOT_MODIFIED).entity("Unable to set contest thaw time to " + thawStr).build();
         }
+        controller.getLog().log(Log.WARNING, LOG_PREFIX + contestId + ": bad value for contest thaw time: " + thawTimeValue);
         return Response.status(Status.BAD_REQUEST).entity("Bad value for contest thaw time request").build();
 
     }

src/edu/csus/ecs/pc2/clics/API202306/SubmissionService.java

@@ -49,6 +49,7 @@
 import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
 import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
 
+import edu.csus.ecs.pc2.convert.EventFeedUtilities;
 import edu.csus.ecs.pc2.core.IInternalController;
 import edu.csus.ecs.pc2.core.Utilities;
 import edu.csus.ecs.pc2.core.exception.SubmissionRejectedException;
@@ -607,24 +608,44 @@ public synchronized Response addNewSubmission(@Context HttpServletRequest servle
                 return Response.status(Response.Status.BAD_REQUEST).entity("no file specified").build();
             }
 
-            List<IFile> srcFiles = new ArrayList<IFile>();
-            for(CLICSFileReference file : files) {
-                String fileName = file.getFilename();
-                if("".equals(fileName)) {
-                    return Response.status(Response.Status.BAD_REQUEST).entity("no file name specified").build();
+            List<IFile> srcFiles;
+
+            // Backward compatability test: If no mime property specified on the first file, then the CLICSFileReference's are
+            // actual files and not a zip file.  This is in here because initially, due to a misinterpretation of the CLICS
+            // 2023-06 specification, the command line submit utility (a.k.a. pc2submit) did not put the files in a zip file,
+            // rather, it created an array of base64 encoded file contents.  The CLICS spec has since been clarified but for now,
+            // we will still support the incorrect implementation as well as the correct one.
+            CLICSFileReference firstFile = files[0];
+            String mimeType = firstFile.getMime();
+
+            // TODO: deprecate this "if" part and leave the "else" part.  JB
+            if(mimeType == null || "".equals(mimeType)) {
+                srcFiles = new ArrayList<IFile>();
+                for(CLICSFileReference file : files) {
+                    String fileName = file.getFilename();
+                    if("".equals(fileName)) {
+                        return Response.status(Response.Status.BAD_REQUEST).entity("no file name specified").build();
+                    }
+                    // allow contestant submission of a zero length file.  This will generate a CE (hopefully).
+                    // if the following code is uncommented, the submission is not made and a 400 is returned to the submitter.
+                    // it appears that other CCS's allow zero length submissions.  *sigh* -- JB
+                    String fileData = file.getData();
+                    if(fileData == null || fileData.length() == 0) {
+                        // nice to put it in the log in case any questions come up.
+                        log.info(user + " POSTing empty source submission on behalf of team " + team_id);
+
+    //                    return Response.status(Response.Status.BAD_REQUEST).entity("no file data specified for " + fileName).build();
+                    }
+                    IFile iFile = new IFileImpl(file.getFilename(), fileData);
+                    srcFiles.add(iFile);
                 }
-                // allow contestant submission of a zero length file.  This will generate a CE (hopefully).
-                // if the following code is uncommented, the submission is not made and a 400 is returned to the submitter.
-                // it appears that other CCS's allow zero length submissions.  *sigh* -- JB
-                String fileData = file.getData();
-                if(fileData == null || fileData.length() == 0) {
-                    // nice to put it in the log in case any questions come up.
-                    log.info(user + " POSTing empty source submission on behalf of team " + team_id);
-
-//                    return Response.status(Response.Status.BAD_REQUEST).entity("no file data specified for " + fileName).build();
+            } else {
+                // There should be precisely one file in the files[] array, which is a zip archive of the source file(s)
+                if(files.length > 1) {
+                    return Response.status(Response.Status.BAD_REQUEST).entity("only one zip archive is allowed").build();
                 }
-                IFile iFile = new IFileImpl(file.getFilename(), fileData);
-                srcFiles.add(iFile);
+
+                srcFiles = EventFeedUtilities.getIFiles(firstFile.getData());
             }
             String entry = sub.getEntry_point();
             IFile mainFile = srcFiles.get(0);

src/edu/csus/ecs/pc2/convert/EventFeedUtilities.java

@@ -1,23 +1,31 @@
-// Copyright (C) 1989-2019 PC2 Development Team: John Clevenger, Douglas Lane, Samir Ashoo, and Troy Boudreau.
+// Copyright (C) 1989-2025 PC2 Development Team: John Clevenger, Douglas Lane, Samir Ashoo, and Troy Boudreau.
 package edu.csus.ecs.pc2.convert;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import edu.csus.ecs.pc2.core.model.IFile;
+import edu.csus.ecs.pc2.core.model.IFileImpl;
 
 /**
  * Event Feed Utilities
- * 
+ *
  * @author ICPC
  *
  */
 public final class EventFeedUtilities {
 
     public static final long MS_PER_SECOND = 1000;
-    
+
     private EventFeedUtilities() {
         super();
     }
@@ -29,7 +37,7 @@ public static String[] getAllLanguages(List<EventFeedRun> runs) {
             map.put(eventFeedRun.getLanguage(), "");
         }
         Set<String> set = map.keySet();
-        return (String[]) set.toArray(new String[set.size()]);
+        return set.toArray(new String[set.size()]);
     }
 
     public static int getMaxProblem(List<EventFeedRun> runs) {
@@ -55,7 +63,7 @@ public static int getMaxTeam(List<EventFeedRun> runs) {
 
     /**
      * Convert decimal string to ms.
-     * 
+     *
      * @param decimalSeconds
      *            - declimal second
      * @return ms
@@ -98,7 +106,7 @@ public static long toMS(String decimalSeconds) {
 
     /**
      * Fetch list of filenames, full path
-     * 
+     *
      * @param dirname
      *            location of submission files
      * @param runId
@@ -123,4 +131,88 @@ public static List<String> fetchRunFileNames(String dirname, String runId) {
         return list;
     }
 
+    /**
+     * Get files from a zipfile's base64 encoded string data
+     *
+     * @param base64Data String comprising a zip file encoded as base64
+     * @return list of IFiles extracted from the input bytes
+     * @throws IllegalArgumentException from the base64 decoder on a data error
+     */
+    public static List<IFile> getIFiles(String base64Data) {
+
+        // use the decoder to both check the validity of, and to store, the byte data.
+        // this will throw an IllegalArgumentException if the data is basd
+        return(getIFiles(Base64.getDecoder().decode(base64Data)));
+    }
+
+    /**
+     * Get files from a zipfile's bytes.
+     *
+     * @param bytes bytes comprising a zip file.
+     * @return list of IFiles extracted from the input bytes
+     */
+    public static List<IFile> getIFiles(byte[] bytes) {
+
+        List<IFile> files = new ArrayList<IFile>();
+
+        ZipInputStream zipStream = null;
+
+        try {
+            zipStream = new ZipInputStream(new ByteArrayInputStream(bytes));
+            ZipEntry entry = null;
+            /**
+             * Read each zip entry, add IFile.
+             */
+            while ((entry = zipStream.getNextEntry()) != null) {
+
+                String entryName = entry.getName();
+
+//                ByteOutputStream byteOutputStream = new ByteOutputStream();
+                ByteArrayOutputStream byteOutputStream = new ByteArrayOutputStream();
+
+                byte[] buffer = new byte[8096];
+                int bytesRead = 0;
+                while ((bytesRead = zipStream.read(buffer)) != -1)
+                {
+                    byteOutputStream.write(buffer, 0, bytesRead);
+                }
+
+//                String base64Data = getBase64Data(byteOutputStream.getBytes());
+                String base64Data = getBase64Data(byteOutputStream.toByteArray());
+                IFile iFile = new IFileImpl(entryName, base64Data);
+                files.add(iFile);
+
+                byteOutputStream.close();
+
+                zipStream.closeEntry();
+            }
+            zipStream.close();
+
+        } catch (Exception e) {
+            if (zipStream != null){
+                try {
+                    zipStream.close();
+                } catch (Exception ze) {
+                    ; // problem closing stream, ignore.
+                }
+            }
+            throw new RuntimeException(e);
+        }
+
+        return files;
+
+    }
+
+    /**
+     * Encode bytes into BASE64.
+     * @param data
+     * @return
+     */
+    public static String getBase64Data( byte [] bytes) {
+        // TODO REFACTOR move to FileUtilities
+        Base64.Encoder encoder = Base64.getEncoder();
+        String base64String = encoder.encodeToString(bytes);
+        return base64String;
+    }
+
 }