isomorphic-git 1.40.6 → 1.40.7

package/index.cjs

@@ -8883,8 +8883,10 @@ async function _currentBranch({
 }
 
 function translateSSHtoHTTP(url) {
-  // handle "shorter scp-like syntax"
-  url = url.replace(/^git@([^:]+):/, 'https://$1/');
+  // handle "shorter scp-like syntax". The user is dropped: it names an ssh
+  // account and means nothing over https, which is what the old expression did
+  // for `git@` too.
+  url = url.replace(/^[^/@:]+@([^/@:]+):/, 'https://$1/');
   // handle proper SSH URLs
   url = url.replace(/^ssh:\/\//, 'https://');
   return url
@@ -9389,9 +9391,15 @@ class GitRemoteManager {
  * @param {string} args.url - The URL of the remote repository.
  * @returns {Object|undefined} - An object containing the transport and address, or undefined if parsing fails.
  */
+// git-clone(1) calls this the "shorter scp-like syntax": [user@]host:path. The
+// user is part of the syntax, not part of the word `git`, and a self-hosted
+// forge is as likely to hand out `gitolite@`, `forgejo@` or `ubuntu@`. The host
+// and the user cannot hold a slash, an at sign or a colon, so `https://x` and a
+// `scheme:address` override are left to the expression below.
+const scpLike = /^[^/@:]+@[^/@:]+:/;
+
 function parseRemoteUrl({ url }) {
-  // the stupid "shorter scp-like syntax"
-  if (url.startsWith('git@')) {
+  if (scpLike.test(url)) {
     return {
       transport: 'ssh',
       address: url,
@@ -9572,8 +9580,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.40.6',
-  agent: 'git/isomorphic-git@1.40.6',
+  version: '1.40.7',
+  agent: 'git/isomorphic-git@1.40.7',
 };
 
 class FIFO {

package/index.js

@@ -8870,8 +8870,10 @@ async function _currentBranch({
 }
 
 function translateSSHtoHTTP(url) {
-  // handle "shorter scp-like syntax"
-  url = url.replace(/^git@([^:]+):/, 'https://$1/');
+  // handle "shorter scp-like syntax". The user is dropped: it names an ssh
+  // account and means nothing over https, which is what the old expression did
+  // for `git@` too.
+  url = url.replace(/^[^/@:]+@([^/@:]+):/, 'https://$1/');
   // handle proper SSH URLs
   url = url.replace(/^ssh:\/\//, 'https://');
   return url
@@ -9376,9 +9378,15 @@ class GitRemoteManager {
  * @param {string} args.url - The URL of the remote repository.
  * @returns {Object|undefined} - An object containing the transport and address, or undefined if parsing fails.
  */
+// git-clone(1) calls this the "shorter scp-like syntax": [user@]host:path. The
+// user is part of the syntax, not part of the word `git`, and a self-hosted
+// forge is as likely to hand out `gitolite@`, `forgejo@` or `ubuntu@`. The host
+// and the user cannot hold a slash, an at sign or a colon, so `https://x` and a
+// `scheme:address` override are left to the expression below.
+const scpLike = /^[^/@:]+@[^/@:]+:/;
+
 function parseRemoteUrl({ url }) {
-  // the stupid "shorter scp-like syntax"
-  if (url.startsWith('git@')) {
+  if (scpLike.test(url)) {
     return {
       transport: 'ssh',
       address: url,
@@ -9559,8 +9567,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.40.6',
-  agent: 'git/isomorphic-git@1.40.6',
+  version: '1.40.7',
+  agent: 'git/isomorphic-git@1.40.7',
 };
 
 class FIFO {