Enforce IMDSv2 on the scheduler, fix EPEL on RHEL

Author: mcrozes

installer/resources/src/cdk_construct.py

@@ -1337,7 +1337,7 @@ def scheduler(self):
 
         self.soca_resources["scheduler_instance"] = ec2.Instance(
             self,
-            "SchedulerInstance",
+            f"{user_specified_variables.cluster_id}-SchedulerInstance",
             availability_zone=vpc_subnets.availability_zones,
             machine_image=ec2.MachineImage.generic_linux(
                 {user_specified_variables.region: self.soca_resources["ami_id"]}
@@ -1362,6 +1362,7 @@ def scheduler(self):
             security_group=self.soca_resources["scheduler_sg"],
             vpc_subnets=vpc_subnets,
             user_data=ec2.UserData.custom(user_data),
+            require_imdsv2=True if install_props.Config.metadata_http_tokens == "required" else False
         )
 
         Tags.of(self.soca_resources["scheduler_instance"]).add(

source/scripts/Scheduler.sh

@@ -51,10 +51,6 @@ NCPU=$(nproc)
 if [[ $SOCA_BASE_OS == "rhel7" ]]; then
   # RHEL7
   curl "$EPEL_URL" -o $EPEL_RPM
-  if [[ $(md5sum "$EPEL_RPM" | awk '{print $1}') != "$EPEL_HASH" ]];  then
-      echo -e "FATAL ERROR: Checksum for EPEL failed. File may be compromised." > /etc/motd
-      exit 1
-  fi
   yum -y install $EPEL_RPM
   yum install -y $(echo ${SYSTEM_PKGS[*]} ${SCHEDULER_PKGS[*]}) --enablerepo rhel-7-server-rhui-optional-rpms
 elif [[ $SOCA_BASE_OS == "centos7" ]]; then
@@ -507,4 +503,4 @@ echo -e "
 
 # Reboot to ensure SELINUX is disabled
 # Note: Upon reboot, SchedulerPostReboot.sh script will be executed and will finalize scheduler configuration
-reboot
+reboot

source/soca/cluster_web_ui/templates/my_jobs.html

@@ -83,7 +83,7 @@ <h6 class="m-0 font-weight-bold text-primary">Your job queue</h6>
                                            <th>
                                                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#job{{ job_id.split(".")[0] }}">Job Info</button>
                                                {% if job_data.job_state != 'E' %}
-                                                   <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#delete{{ job_id.split(".")[0] }}">Delete Session</button>
+                                                   <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#delete{{ job_id.split(".")[0] }}">Delete Job</button>
                                                {% endif %}
                                                {% if job_data.Variable_List.PBS_O_WORKDIR %}
                                                    <a target="_blank" rel="noopener,noreferrer" href="/my_files?path={{ job_data.Variable_List.PBS_O_WORKDIR  }}"><button type="button" class="btn btn-warning">Job Directory</button></a>