Webhook: Azure git repo urls fail to match

[AlexGS74]

To trigger argocd updates on git push I have a hook setup to mimic GitHub push events. It gets accepted by Argo but it fails to match the repos defined in Argo.

"https://tenant-name@dev.azure.com/tenant-name/ProjectName/_git/GitOps does not match (?i)^(http://|https://|\\w+@|ssh://(\\w+@)?)dev\\.azure\\.com(:[0-9]+|)[:/]tenant-name/ProjectName/_git/GitOps(\\.git)?$"

The generated regex has a few issues with the Azure specific Urls:

• the tenant name has a dash in it but the matching group is (\w+@)? while it should be ([\w-]+)?
• the same group is generated inside of the group with series of one-of matches and that makes it never match for urls starting with http and https prefixes; the fix would be to move it outside like here: (?i)^(http://|https://|\\w+@|ssh://)(\\w+@)?dev\\.azure\\.com(:[0-9]+|)[:/]tenant-name/ProjectName/_git/GitOps(\\.git)?$

As alternative I tried to use Ssh url and the same generated regexp has issue with ssh matches too:

"git@ssh.dev.azure.com:v3/tenant-name/ProjectName/GitOps does not match (?i)^(http://|https://|\\w+@|ssh://(\\w+@)?)ssh\\.dev\\.azure\\.com(:[0-9]+|)[:/]tenant-name/ProjectName/GitOps(\\.git)?$"

The issue here is that the regexp expects the ssh to follow uri format which it doesn't:

• the (:[0-9]+|) group doesn't match :v3 which in the case of ssh is not a port but a part of the path; this can be fixed by (:[0-9a-zA-Z]+|) or (:\w+|)

To Reproduce

Enable debug level logging in the argocd-server app and use the command below to test the bahaviour:

curl https://example.argocd/argocd/api/webhook -k -H 'X-GitHub-Event: push' -d '{
  "ref": "refs/heads/release/ci", \
  "repository": { \
    "html_url": "https://tenant-name@dev.azure.com/tenant-name/ProjectName/_git/GitOps", \
    "default_branch": "refs/heads/main" \
  }, \
  "commits": [ \
    { \
      "modified": [ "/pipelines/trigger-argocd-refresh.yml" ] \ 
    } \ 
  ] \ 
}' \

Expected behavior

The regexps should match above cases.

Version

> argocd version
argocd: v2.1.3+d855831.dirty
  BuildDate: 2021-09-30T22:11:24Z
  GitCommit: d855831540e51d8a90b1006d2eb9f49ab1b088af
  GitTreeState: dirty
  GoVersion: go1.17.1
  Compiler: gc
  Platform: darwin/amd64
argocd-server: v2.3.3+07ac038

[olljanat]

To trigger argocd updates on git push I have a hook setup to mimic GitHub push events. It gets accepted by Argo...

Interesting idea. Can you please share how you do it on #3937