Fixes issues with openssh-win32 agent. #295

nitin88 · 2016-06-29T12:37:53Z

When Openssh-win32 agent is installed, Get-Command ssh-agent ssh-add returns openssh related commands which are not compat with Poshgit. Use ssh stuff provided with git only

Fixes #258 #292

nitin88 · 2016-06-29T12:38:36Z

GitUtils.ps1

@@ -282,15 +281,30 @@ function Find-Pageant() {

 # Attempt to guess $program's location. For ssh-agent/ssh-add.
 function Find-Ssh($program = 'ssh-agent') {
+    $sshLocation = 'C:\Program Files\Git\usr\bin\'


This has to be given as preference from user perspective. not sure where to keep this and how to import that var here. temp hardcoded

Is this actually necessary? I would expect the existing code in Find-Ssh to be able to resolve the correct location relative to the discovered git command.

dahlbyk · 2016-06-30T06:33:19Z

GitUtils.ps1

@@ -256,8 +256,7 @@ function Get-SshAgent() {
    } else {
        $agentPid = $Env:SSH_AGENT_PID
        if ($agentPid) {
-            $sshAgentProcess = Get-Process | Where-Object { $_.Id -eq $agentPid -and $_.Name -eq 'ssh-agent' }
-            if ($null -ne $sshAgentProcess) {
+            if (((Get-Process -Id $agentPid -FileVersionInfo -ErrorAction SilentlyContinue).Filename).Contains("Git")) {


If $agentPid is valid but the process has been killed, this will blow up when you try to access Filename.

(Get-Process -Id 11111111 -FileVersionInfo -ErrorAction SilentlyContinue).Filename

doesn't throw any error. you will get empty data

nitin88 · 2016-06-30T09:59:44Z

Reworked on this. Win32-OpenSsh install ssh as service. leverage that functionality. Posh-git no longer requires Git Ssh agent if openssh agent installed

nitin88 · 2016-06-30T10:00:01Z

@dahlbyk please review the same.

dahlbyk · 2016-06-30T19:16:55Z

GitUtils.ps1

+    return Get-Service -Name $service -ErrorAction SilentlyContinue
+}
+
+function Find-SericePID($service = 'ssh-agent') {


Typo: Serice

dahlbyk · 2016-06-30T19:23:50Z

I like this approach better than the explicit check for Git in the ssh-agent path. I'm not a Win32-OpenSSH user (yet, I suppose), but I'm hoping we can get broader confirmation that this works as expected.

Thanks for taking this on!

theaquamarine · 2016-06-30T20:26:42Z

GitUtils.ps1

+
+function Find-SericePID($service = 'ssh-agent') {
+    # Find if wind32-openssh available and use it
+    return (get-wmiobject win32_service | where { $_.name -eq $service}).processID


(Get-Service $Service | Get-Process).Id will be much faster than this.

DarwinJS · 2016-07-01T00:59:30Z

I'm late to the game here, but here is how I figure out if a [1] running instance of a process, is [2] from the win32-openssh folder:

$TargetFolder = "C:\Program Files\OpenSSH-Win64"
$SSHServiceInstanceExistsAndIsOurs = ([bool]((Get-WmiObject win32_service | ?{$_.Name -ilike 'sshd'} | select -expand PathName) -ilike "*$TargetFolder*"))

This would let you understand which package the running service is coming from.

Also - I think the SSH in git is much more debugged than Win32-OpenSSH, especially for git-ish stuff. So I would stick with it since you depend on git being installed anyway.

Maybe if another ssh is loaded you warn the user that poshgit may not work with it?

nitin88 · 2016-07-01T03:29:49Z

@DarwinJS

I don't want to hard code any path. the path might change in the next build.
ssh is independent tool. the one which comes in "git" is open ssh one. Microsoft forked it and baking into Windows.
Upcoming releases of Windows, will have "openssh-win32" in it's core.

So Its good to support and if we look at memory/cpu utilization of openssh-win32, is around 80% better than git one

DarwinJS · 2016-07-01T11:18:24Z

Good info. Thanks.

dahlbyk · 2016-08-12T21:09:53Z

GitUtils.ps1

 }

 function Get-TempEnv($key) {
    $path = Join-Path ($Env:TEMP) ".ssh\$key.env"
    if (Test-Path $path) {
        $value =  Get-Content $path
-        [void][Environment]::SetEnvironmentVariable($key, $value, [EnvironmentVariableTarget]::Process)
+        Set-Item Env:$key -Value $value -ErrorAction SilentlyContinue


Why switch from [Environment]::SetEnvironmentVariable(...) to Set-Item? I don't remember why I used SetEnvironmentVariable() in the first place, but I'm curious what the difference is from a OpenSsh-Win32 perspective?

dahlbyk · 2016-08-12T21:12:58Z

One last question, but I think this is looking pretty good. Can you pull in dahlbyk:master and resolve the conflicts?

nitin88 · 2016-08-22T09:27:29Z

downmerged from master

dahlbyk · 2016-08-23T18:46:54Z

I think we're good here.

@theaquamarine I believe this resolves the environment variable issue in #302?

rkeithhill · 2016-12-29T03:59:56Z

Another thing to consider is how this should work on PowerShell v6 on Linux and macOS.

dahlbyk · 2016-12-29T21:44:26Z

@nitin88 sorry to have let this gone stale - can you either resolve the conflict or let us edit this PR?

Another thing to consider is how this should work on PowerShell v6 on Linux and macOS.

Does Get-Service exist on Linux/macOS? If it doesn't, we should be able to add guards rather easily ahead of 1.0 support for Core.

From a cross-platform standpoint, is there a useful distinction between these?

Set-Item Env:$Key -Value $Value -ErrorAction SilentlyContinue
[void][Environment]::SetEnvironmentVariable($Key, $Value)

nitin88 · 2016-12-30T03:21:54Z

@dahlbyk both are same. One is pure powershell implementation while the other one is C# implementation.

I am not sure whether 'Get-Service' exists in *nix. Ideally the code is consistent between Windows/*nix except calling layer underneath has changed.

Note: Now you can contribute

rkeithhill · 2016-12-30T03:32:53Z

As of 6.0.0-alpha.14, Get-Service is not available on Linux.

Update: As of 6.0.2 neither Get-Service nor Start-Service are available on Linux/macOS.

brunoyb · 2018-05-03T03:31:54Z

Hi! With Windows 10 April 2018 Update Win32-OpenSSH was installed automatically for me, so the ssh-agent stopped working properly (I have Start-SshAgent in my profile.ps1). As a workaround I simply removed the Win32-OpenSSH tools from PATH but it would be nice if it could work normally, and I believe this is what this PR is doing! Any ETA on when we can go forward with this? Is there something we can do?

Thanks!

dahlbyk · 2018-05-03T04:35:36Z

I suppose this impacting more people via Windows Update is a good reason to wrap up the ssh-agent situation. The goal for v1 is to move everything ssh-ish into a separate module, but it would be good if everything worked reasonably in v0.x.

There are a handful of open ssh PRs that are significantly out of date, if anyone cares to consolidate/update them targeting the v0 branch.

rkeithhill · 2018-05-03T13:51:38Z

FWIW I'm using the new OpenSSH implementation in Windows and as a result I do not need any of the SSH support in posh-git. I set up the new ssh-agent service to start automatically and start it. Then, when you add your private keys with the OpenSSH version of ssh-add, that key will be remembered across reboots and because ssh-agent is started (automatically) as a service, you don't need to start it in your PowerShell profile anymore.

In order to get Git to use the new OpenSSH, you will want to set this system or user env var:

GIT_SSH = C:\Windows\system32\OpenSSH\ssh.exe

Double check that path. I'm actually using the latest version of OpenSSH for Windows installed via choco install OpenSSH. If you use Chocolatey to install the latest version, then use the path it installs to i.e. C:\Program Files\OpenSSH-Win64\ssh.exe.

rkeithhill · 2018-05-23T19:38:14Z

GitUtils.ps1

+
+function Find-Service($service = 'ssh-agent') {
+     # Find if wind32-openssh available and use it
+    return Get-Service -Name $service -ErrorAction SilentlyContinue


All references to Get-Service and Start-Service need to be behind a "Windows-only" firewall.

rkeithhill

See comment about putting Windows specific cmdlets like Get/Start-Service behind a "Windows-only" firewall.

dahlbyk · 2018-06-18T22:21:24Z

Closing in deference to #586. Sorry we didn't review this in a more timely manner!

nitin88 added 3 commits June 29, 2016 18:02

Fix issues with openssh-win32 in vague way

931d299

Small fix

3abada0

Update GitUtils.ps1

37ba80d

nitin88 reviewed Jun 29, 2016
View reviewed changes

nigurr mentioned this pull request Jun 30, 2016

Powershell stops initializing ssh-agent #292

Closed

dahlbyk reviewed Jun 30, 2016
View reviewed changes

Make posh-git comply with win32-openssh

edd12c0

dahlbyk reviewed Jun 30, 2016
View reviewed changes

This was referenced Jun 30, 2016

Start-SshAgent Opens a command prompt and hangs the power shell #270

Closed

Powershell hangs on startup #258

Closed

theaquamarine reviewed Jun 30, 2016
View reviewed changes

Cleanup and polishing

893ec41

Fixed Removing env param

769c26f

dahlbyk reviewed Aug 12, 2016
View reviewed changes

Downmerged from master

e82cc14

dahlbyk mentioned this pull request Dec 29, 2016

PowerShell Core on Linux support #302

Closed

5 tasks

dahlbyk mentioned this pull request Dec 30, 2016

Spin off SSH Agent module? #338

Closed

dahlbyk added this to the SSH Agents milestone Dec 31, 2016

dahlbyk force-pushed the master branch from 0cddf55 to 53c9145 Compare September 29, 2017 06:33

rkeithhill reviewed May 23, 2018

View reviewed changes

rkeithhill requested changes May 23, 2018

View reviewed changes

dahlbyk added the Area-SSH label Jun 14, 2018

dahlbyk mentioned this pull request Jun 18, 2018

Add support for win10 openssh #586

Merged

dahlbyk closed this Jun 18, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes issues with openssh-win32 agent. #295

Fixes issues with openssh-win32 agent. #295

nitin88 commented Jun 29, 2016 •

edited by dahlbyk

Loading

nitin88 Jun 29, 2016

dahlbyk Jun 30, 2016

dahlbyk Jun 30, 2016

nigurr Jun 30, 2016

nitin88 commented Jun 30, 2016 •

edited

Loading

nitin88 commented Jun 30, 2016

dahlbyk Jun 30, 2016

dahlbyk commented Jun 30, 2016

theaquamarine Jun 30, 2016

DarwinJS commented Jul 1, 2016

nitin88 commented Jul 1, 2016 •

edited

Loading

DarwinJS commented Jul 1, 2016

dahlbyk Aug 12, 2016

dahlbyk commented Aug 12, 2016

nitin88 commented Aug 22, 2016

dahlbyk commented Aug 23, 2016

rkeithhill commented Dec 29, 2016

dahlbyk commented Dec 29, 2016

nitin88 commented Dec 30, 2016

rkeithhill commented Dec 30, 2016 •

edited

Loading

brunoyb commented May 3, 2018

dahlbyk commented May 3, 2018

rkeithhill commented May 3, 2018 •

edited

Loading

rkeithhill May 23, 2018

rkeithhill left a comment

dahlbyk commented Jun 18, 2018

Fixes issues with openssh-win32 agent. #295

Fixes issues with openssh-win32 agent. #295

Conversation

nitin88 commented Jun 29, 2016 • edited by dahlbyk Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nitin88 commented Jun 30, 2016 • edited Loading

nitin88 commented Jun 30, 2016

Choose a reason for hiding this comment

dahlbyk commented Jun 30, 2016

Choose a reason for hiding this comment

DarwinJS commented Jul 1, 2016

nitin88 commented Jul 1, 2016 • edited Loading

DarwinJS commented Jul 1, 2016

Choose a reason for hiding this comment

dahlbyk commented Aug 12, 2016

nitin88 commented Aug 22, 2016

dahlbyk commented Aug 23, 2016

rkeithhill commented Dec 29, 2016

dahlbyk commented Dec 29, 2016

nitin88 commented Dec 30, 2016

rkeithhill commented Dec 30, 2016 • edited Loading

brunoyb commented May 3, 2018

dahlbyk commented May 3, 2018

rkeithhill commented May 3, 2018 • edited Loading

Choose a reason for hiding this comment

rkeithhill left a comment

Choose a reason for hiding this comment

dahlbyk commented Jun 18, 2018

nitin88 commented Jun 29, 2016 •

edited by dahlbyk

Loading

nitin88 commented Jun 30, 2016 •

edited

Loading

nitin88 commented Jul 1, 2016 •

edited

Loading

rkeithhill commented Dec 30, 2016 •

edited

Loading

rkeithhill commented May 3, 2018 •

edited

Loading