diff --git a/src/spiffworkflow_backend/services/git_service.py b/src/spiffworkflow_backend/services/git_service.py index cf308ef6..16c064d1 100644 --- a/src/spiffworkflow_backend/services/git_service.py +++ b/src/spiffworkflow_backend/services/git_service.py @@ -197,14 +197,13 @@ class GitService: f" body: {webhook}" ) - clone_url = webhook["repository"]["clone_url"] - if ( - clone_url - != current_app.config["SPIFFWORKFLOW_BACKEND_GIT_PUBLISH_CLONE_URL"] - ): + config_clone_url = current_app.config["SPIFFWORKFLOW_BACKEND_GIT_PUBLISH_CLONE_URL"] + repo = webhook["repository"] + valid_clone_urls = [repo["clone_url"], repo["git_url"], repo["ssh_url"]] + if config_clone_url not in valid_clone_urls: raise GitCloneUrlMismatchError( - "Configured clone url does not match clone url from webhook:" - f" {clone_url}" + "Configured clone url does not match the repo URLs from webhook: %s =/= %s" + % (config_clone_url, valid_clone_urls) ) if "ref" not in webhook: