Merge branch 'dev' into main

Author: lukaszgryglicki

cla-backend-go/gitlab_api/client.go

@@ -66,6 +66,9 @@ func EncryptAuthInfo(oauthResp *OauthSuccessResponse, gitLabApp *App) (string, e
 	if err != nil {
 		return "", fmt.Errorf("problem marshalling oauth resp json, error: %v", err)
 	}
+	if len(b) > 64*1024*1024 { // 64 MB limit
+		return "", fmt.Errorf("oauth response size too large")
+	}
 	authInfo := string(b)
 	//log.Infof("auth info before encrypting : %s", authInfo)
 

cla-backend-go/v2/gitlab-activity/service.go

@@ -722,7 +722,7 @@ func (s *service) checkGitLabGroupApproval(ctx context.Context, userName, URL st
 
 	log.WithFields(f).Debugf("checking approval list gitlab org criteria : %s for user: %s ", URL, userName)
 	var searchURL = URL
-	params := getParams(`(?P<base>\bhttps://gitlab.com/\b)(?P<group>\bgroups\/\b)?(?P<name>\w+)`, URL)
+	params := getParams(`(?P<base>\bhttps://gitlab\.com/\b)(?P<group>\bgroups\/\b)?(?P<name>\w+)`, URL)
 	if params[`group`] == "" {
 		params[`group`] = "groups/"
 		updated := fmt.Sprintf("%s%s%s", params[`base`], params[`group`], params[`name`])

cla-backend/cla/utils.py

@@ -1209,13 +1209,13 @@ def fetch_token(client_id, state, token_url, client_secret, code, redirect_uri=N
         oauth2 = OAuth2Session(client_id, state=state, scope=["user:email"], redirect_uri=redirect_uri)
     else:
         oauth2 = OAuth2Session(client_id, state=state, scope=["user:email"])
-    cla.log.debug(
-        f"{fn} - oauth2.fetch_token - "
-        f"token_url: {token_url}, "
-        f"client_id: {client_id}, "
-        f"client_secret: {client_secret}, "
-        f"code: {code}"
-    )
+    #cla.log.debug(
+    #    f"{fn} - oauth2.fetch_token - "
+    #    f"token_url: {token_url}, "
+    #    f"client_id: {client_id}, "
+    #    f"client_secret: {client_secret}, "
+    #    f"code: {code}"
+    #)
     return oauth2.fetch_token(token_url, client_secret=client_secret, code=code)
 
 

cla-backend/requirements.txt

@@ -5,7 +5,7 @@ attrs==19.3.0
 beautifulsoup4==4.8.1
 boto3==1.22.1
 botocore==1.25.11
-certifi==2023.7.22
+certifi==2024.7.4
 chardet==3.0.4
 colorama==0.4.3
 coverage==4.5.4
@@ -16,7 +16,6 @@ ecdsa==0.14.1
 falcon==2.0.0
 future==0.18.3
 gossip==2.3.1
-gunicorn==19.9.0
 hug==2.6.0
 idna==3.7
 importlib-metadata==1.6.1
@@ -56,3 +55,4 @@ pynamodb==6.0.2
 wrapt==1.17.2
 astroid==3.3.8
 pluggy==1.5.0
+gunicorn==22.0.0

tests/rest/requirements.freeze.txt

@@ -25,7 +25,7 @@ pytest-sugar==0.9.2
 pytest-tldr==0.2.1
 python-box==3.4.5
 python-dateutil==2.8.0
-PyYAML==5.1.2
+PyYAML==5.3.1
 requests==2.22.0
 six==1.12.0
 stevedore==1.31.0