Hot fix 4

Signed-off-by: Lukasz Gryglicki <[email protected]>

Author: lukaszgryglicki

cla-backend/cla/models/dynamo_models.py

@@ -735,7 +735,7 @@ def get_value(self, value):
             return set()
         if self.attr_type == 'SS' and 'L' in value:
             value = {'SS':list(map(lambda x: x['S'], value['L']))}
-        super(PatchedUnicodeSetAttribute, self).get_value(value)
+        return super(PatchedUnicodeSetAttribute, self).get_value(value)
 
     def deserialize(self, value):
         if not value:
@@ -2013,7 +2013,6 @@ def preprocess_pattern(self, emails, patterns) -> bool:
         :rtype: bool
         """
         fn = 'dynamo_models.preprocess_pattern'
-        cla.log.debug(f"{fn}: LG: self={self}, emails={emails}, patterns={patterns}")
         for pattern in patterns:
             if pattern.startswith("*."):
                 pattern = pattern.replace("*.", ".*")
@@ -2024,12 +2023,10 @@ def preprocess_pattern(self, emails, patterns) -> bool:
 
             preprocessed_pattern = "^.*@" + pattern + "$"
             pat = re.compile(preprocessed_pattern)
-            cla.log.debug(f"{fn}: LG: patters={pattern}, preprocessed_pattern={preprocessed_pattern}, pat={pat}")
             for email in emails:
                 if pat.match(email) is not None:
                     self.log_debug(f'{fn} - found user email in email approval pattern')
                     return True
-        cla.log.debug(f"{fn}: LG: no match")
         return False
 
     # Accepts a Signature object
@@ -2045,14 +2042,11 @@ def is_approved(self, ccla_signature: Signature) -> bool:
         :rtype: bool
         """
         fn = 'dynamo_models.is_approved'
-        cla.log.debug(f"{fn}: LG: self={self}, ccla_signature={ccla_signature}")
         # Returns the union of lf_emails and emails (separate columns)
         emails = self.get_all_user_emails()
-        cla.log.debug(f"{fn}: LG: emails={emails}")
         if len(emails) > 0:
             # remove leading and trailing whitespace before checking emails
             emails = [email.strip() for email in emails]
-        cla.log.debug(f"{fn}: LG: emails={emails} (stripped)")
 
         # First, we check email whitelist
         whitelist = ccla_signature.get_email_whitelist()

cla-backend/cla/utils.py

@@ -683,7 +683,6 @@ def user_signed_project_signature(user: User, project: Project) -> bool:
 
     # Check if we have an CCLA for this user
     company_id = user.get_user_company_id()
-    cla.log.debug(f"{fn}: LG: company_id={company_id}")
 
     ccla_pass = False
     if company_id is not None:
@@ -696,7 +695,6 @@ def user_signed_project_signature(user: User, project: Project) -> bool:
         employee_signature = user.get_latest_signature(
             project.get_project_id(), company_id=company_id, signature_signed=True, signature_approved=True
         )
-        cla.log.debug(f"{fn}: LG: employee_signature={employee_signature}")
 
         if employee_signature is not None:
             cla.log.debug(
@@ -714,7 +712,6 @@ def user_signed_project_signature(user: User, project: Project) -> bool:
                     f"company with id does not exist: {company_id}."
                 )
                 return False
-            cla.log.debug(f"{fn}: LG: company={company}")
 
             # Get CCLA signature of company to access whitelist
             cla.log.debug(
@@ -724,7 +721,6 @@ def user_signed_project_signature(user: User, project: Project) -> bool:
             signature = company.get_latest_signature(
                 project.get_project_id(), signature_signed=True, signature_approved=True
             )
-            cla.log.debug(f"{fn}: LG: signature={signature}")
 
             # Don't check the version for employee signatures.
             if signature is not None:
@@ -743,7 +739,6 @@ def user_signed_project_signature(user: User, project: Project) -> bool:
                 #                   'project requires ICLA signature as well as CCLA signature ')
                 if user.is_approved(signature):
                     ccla_pass = True
-                    cla.log.debug(f"{fn}: LG: ccla_pass={ccla_pass}")
                 else:
                     # Set user signatures approved = false due to user failing whitelist checks
                     cla.log.debug(

utils/check_prepare_employee_signature_py.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+# API_URL=https://3f13-147-75-85-27.ngrok-free.app (defaults to localhost:5000)
+# user_id='9dcf5bbc-2492-11ed-97c7-3e2a23ea20b5'
+# company_id='862ff296-6508-4f10-9147-2bc2dd7bfe80'
+# project_id='88ee12de-122b-4c46-9046-19422054ed8d'
+# DEBUG=1 ./utils/check_prepare_employee_signature_py 9dcf5bbc-2492-11ed-97c7-3e2a23ea20b5 862ff296-6508-4f10-9147-2bc2dd7bfe80 88ee12de-122b-4c46-9046-19422054ed8d github 'http://localhost'
+# DEBUG=1 ./utils/check_prepare_employee_signature_py.sh 65d22813-1ac0-4292-bb68-fdcb278473a5 4930fe6e-e023-4f56-9767-6f1996a7b730 43c546ff-bc79-4a32-9454-77dabd6afaee
+
+if [ -z "$1" ]
+then
+  echo "$0: you need to specify user_id as a 1st parameter"
+  exit 1
+fi
+export user_id="$1"
+
+if [ -z "$2" ]
+then
+  echo "$0: you need to specify company_id as a 2nd parameter"
+  exit 2
+fi
+export company_id="$2"
+
+if [ -z "$3" ]
+then
+  echo "$0: you need to specify project_id as a 3rd parameter"
+  exit 3
+fi
+export project_id="$3"
+
+if [ -z "$API_URL" ]
+then
+  export API_URL="http://localhost:5000"
+fi
+
+if [ ! -z "$DEBUG" ]
+then
+  echo "curl -s -XPOST -H 'Content-Type: application/json' '${API_URL}/v2/check-prepare-employee-signature' -d '{\"project_id\":\"${project_id}\",\"user_id\":\"${user_id}\",\"company_id\":\"${company_id}\"}\"}' | jq -r '.'"
+fi
+curl -s -XPOST -H "Content-Type: application/json" "${API_URL}/v2/check-prepare-employee-signature" -d "{\"project_id\":\"${project_id}\",\"user_id\":\"${user_id}\",\"company_id\":\"${company_id}\"}" | jq -r '.'

utils/copy_prod_case.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+echo "copy project"
+./utils/copy_prod_to_dev.sh projects project_id 43c546ff-bc79-4a32-9454-77dabd6afaee
+echo "copy user"
+./utils/copy_prod_to_dev.sh users user_id 65d22813-1ac0-4292-bb68-fdcb278473a5
+echo "copy company"
+./utils/copy_prod_to_dev.sh companies company_id 4930fe6e-e023-4f56-9767-6f1996a7b730
+echo "copy signature (CCLA)"
+./utils/copy_prod_to_dev.sh signatures signature_id b90452c9-97b3-411e-9004-b58260297fcb
+echo "copy signature (ECLA)"
+./utils/copy_prod_to_dev.sh signatures signature_id 167e04e4-650a-40ef-a138-c1087201231e
+
+echo "project:"
+./utils/scan.sh projects project_id 43c546ff-bc79-4a32-9454-77dabd6afaee
+echo "user:"
+./utils/scan.sh users user_id 65d22813-1ac0-4292-bb68-fdcb278473a5
+echo "company:"
+./utils/scan.sh companies company_id 4930fe6e-e023-4f56-9767-6f1996a7b730
+echo "CCLA signature:"
+./utils/scan.sh signatures signature_id b90452c9-97b3-411e-9004-b58260297fcb
+echo "ECLA signature:"
+./utils/scan.sh signatures signature_id 167e04e4-650a-40ef-a138-c1087201231e

utils/copy_prod_to_dev.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+if [ -z "$1" ]
+then
+  echo "$0: you need to specify table to copy from"
+  exit 1
+fi
+table="${1}"
+
+if [ -z "$2" ]
+then
+  echo "$0: you need to specify ${table} key column name"
+  exit 2
+fi
+key_column="${2}"
+
+if [ -z "$3" ]
+then
+  echo "$0: you need to specify ${table} ${key_column} value"
+  exit 3
+fi
+key_value="${3}"
+
+if [ ! -z "$DEBUG" ]
+then
+  echo "aws --profile lfproduct-prod dynamodb get-item --table-name cla-prod-${table} --key {\"${key_column}\": {\"S\": \"${key_value}\"}} | jq -c .Item"
+fi
+
+object=$(aws --profile lfproduct-prod dynamodb get-item --table-name cla-prod-${table} --key "{\"${key_column}\": {\"S\": \"${key_value}\"}}" | jq -c .Item)
+command="aws --profile lfproduct-dev dynamodb put-item --table-name \"cla-dev-${table}\" --item '${object}'"
+if [ ! -z "$DEBUG" ]
+then
+  echo "${object}" | jq .
+  echo "${command}"
+fi
+eval $command