Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable SSH multiplexing if not supported #1093

Merged
merged 6 commits into from Sep 11, 2020
Merged

Disable SSH multiplexing if not supported #1093

merged 6 commits into from Sep 11, 2020

Conversation

@fmeum
Copy link
Member

@fmeum fmeum commented Sep 10, 2020

馃摙 Type of change

  • Bugfix
  • New feature
  • Enhancement
  • Refactoring
  • Dependency updates

馃摐 Description

Fall back to single channel SSH connections if the server (looking at you, Bitbucket) does not support multiplexing.

馃挕 Motivation and Context

Should fix #1092 when it's done.

馃挌 How did you test it?

Not yet. Create a private Bitbucket repository, clone it to the device, attempt to synchronize after creating a new password and get the error about broken multiplexing then trying again correctly uses a pull + push separately.

馃摑 Checklist

  • I formatted the code with the IDE's reformat action (Ctrl + Shift + L/Cmd + Shift + L)
  • I reviewed submitted code
  • I added a CHANGELOG entry if applicable

馃敭 Next steps

馃摳 Screenshots / GIFs

@fmeum
Copy link
Member Author

@fmeum fmeum commented Sep 10, 2020

This is my attempt at fixing #1092. It is not completely consistent with how we sync (it's missing the occasional sync commit, which we may want to include in the PullOperation anyway) and untested. @msfjarvis Could you take over from here?

@fmeum fmeum requested a review from msfjarvis Sep 10, 2020
@msfjarvis
Copy link
Member

@msfjarvis msfjarvis commented Sep 10, 2020

This is my attempt at fixing #1092. It is not completely consistent with how we sync (it's missing the occasional sync commit, which we may want to include in the PullOperation anyway) and untested. @msfjarvis Could you take over from here?

Sure thing.

@msfjarvis msfjarvis self-assigned this Sep 10, 2020
@msfjarvis msfjarvis added the bug label Sep 10, 2020
@msfjarvis msfjarvis added this to the 1.12.0 milestone Sep 10, 2020
msfjarvis added 2 commits Sep 10, 2020
鈥tory

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
@fmeum
Copy link
Member Author

@fmeum fmeum commented Sep 10, 2020

That story is 5/5.

@msfjarvis msfjarvis force-pushed the bug/multiplexing branch from 9c3ef5b to 52b8f42 Sep 11, 2020
* develop:
  build: update Kotlin and dependency-updates plugin (#1094)
@msfjarvis msfjarvis marked this pull request as ready for review Sep 11, 2020
@msfjarvis msfjarvis requested a review from Skrilltrax as a code owner Sep 11, 2020
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
@msfjarvis
Copy link
Member

@msfjarvis msfjarvis commented Sep 11, 2020

Works for me now, but the double authentication w/ keystore-backed SSH keys sure is annoying. Get your shit together Bitbucket.

@msfjarvis msfjarvis removed the in progress label Sep 11, 2020
@fmeum
Copy link
Member Author

@fmeum fmeum commented Sep 11, 2020

Works for me now, but the double authentication w/ keystore-backed SSH keys sure is annoying. Get your shit together Bitbucket.

We could get around this by only showing the prompt if the reauth timeout hasn't passed. As it is currently at 30 or 15 seconds, that should mostly work unless the user is on a really slow connection.

@msfjarvis
Copy link
Member

@msfjarvis msfjarvis commented Sep 11, 2020

Works for me now, but the double authentication w/ keystore-backed SSH keys sure is annoying. Get your shit together Bitbucket.

We could get around this by only showing the prompt if the reauth timeout hasn't passed. As it is currently at 30 or 15 seconds, that should mostly work unless the user is on a really slow connection.

I'd rather just let it be at this point.

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
@msfjarvis
Copy link
Member

@msfjarvis msfjarvis commented Sep 11, 2020

If the macOS runner is gonna be slow af anyway might as well get the trivial stuff done too.

@msfjarvis msfjarvis merged commit 7a58e39 into develop Sep 11, 2020
5 checks passed
5 checks passed
test-pr (23, freeDebug)
Details
test-pr (23, nonFreeDebug)
Details
test-pr (29, freeDebug)
Details
test-pr (29, nonFreeDebug)
Details
WIP Ready for review
Details
@msfjarvis msfjarvis deleted the bug/multiplexing branch Sep 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants
You can鈥檛 perform that action at this time.