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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Bump to Go 1.21 #440

Merged
merged 14 commits into from
Aug 19, 2023
Merged

Bump to Go 1.21 #440

merged 14 commits into from
Aug 19, 2023

Conversation

jpillora
Copy link
Owner

@jpillora jpillora commented Aug 13, 2023 •
edited
Loading

  • Bump deps
  • Bump go
  • Key file/gen (thanks @cmenginnz)

@jpillora
Copy link
Owner Author

Can you plz review @cmenginnz ?

jpillora
jpillora commented Aug 13, 2023
View reviewed changes
client/client.go
@@ -105,7 +105,7 @@ func NewClient(c *Config) (*Client, error) {
tlsConfig: nil,
}
//set default log level
client.Logger.Info = c.Verbose
client.Logger.Info = true
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

im reverting this, users who want to silence chisel can >/dev/null

@jpillora
Copy link
Owner Author

I’m thinking of switching keygenfile to use plain base 64, because PEM encoding is multi line and adds an extra step when passing it inline. I’m thinking ck-<n base64 chars> which would also make it easier to identify its inline - rather than a file path

cmenginnz
cmenginnz approved these changes Aug 13, 2023
View reviewed changes
Copy link
Contributor

@cmenginnz cmenginnz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cmenginnz
Copy link
Contributor

I’m thinking of switching keygenfile to use plain base 64, because PEM encoding is multi line and adds an extra step when passing it inline. I’m thinking ck-<n base64 chars> which would also make it easier to identify its inline - rather than a file path

The ssh.ParsePrivateKey(key) function actually supports RSA (PKCS#1), PKCS#8, DSA (OpenSSL), and ECDSA private keys. If we use a private file format here, we will lose the support of these algorithms and the existing tools such as openssl.
Please let me know your decision and I'm willing to continue patching for it.

@jpillora
Copy link
Owner Author

I think we'd want the key parser to support both PEM and chisel-key format (ck-<163-base64-chars> drop the 2 equals)

@cmenginnz
Copy link
Contributor

@jpillora I made a PR(#441) to go121 branch that implements:

  1. --genkey generates a key file in CK format
  2. --keyfile accepts:
    2.1 a file in CK format
    2.2 a file in PEM formet
    2.3 an inline key in CK format

@jpillora jpillora merged commit 69093be into master Aug 19, 2023
6 checks passed
@jpillora jpillora deleted the go121 branch August 19, 2023 01:00
@jpillora
Copy link
Owner Author

It took a while, but its in! Thanks for your help @cmenginnz 😄

@jpillora
Copy link
Owner Author

v1.9.0 releasing now https:/jpillora/chisel/actions/runs/5908510975

This was referenced Aug 20, 2023
Closed
Closed
Closed
Closed
Closed
bmartins-unit pushed a commit to OutSystems/chisel that referenced this pull request Sep 6, 2023
@OS-kiranmalsetty @dependabot
@Rajpratik71 @jpillora @fsiegmund @andres-portainer @0xflotus @BigSully @c-f @zuzgon @barak-sharoni-velocity @GuillaumeSmaha @cmenginnz @maurerr
Upstream sync (#14)
187fea3 
* Set ServerName (SNI) to *hostname. Useful for spoofing our way through restrictive gateways.

* Bump actions/checkout from 2 to 3.1.0

Bumps [actions/checkout](https:/actions/checkout) from 2 to 3.1.0.
- [Release notes](https:/actions/checkout/releases)
- [Changelog](https:/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v2...v3.1.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Added --sni switch to control the ServerName when connecting with TLS. Makes 'domain fronting' possible.

* feat: dependabot workflow automation for updating dependency 

Signed-off-by: Pratik Raj <[email protected]>

* Bump github.com/fsnotify/fsnotify from 1.4.9 to 1.6.0 (jpillora#389)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* UDP buffer size override with CHISEL_UDP_MAX_SIZE environment variable (jpillora#367)

* Add locking around the connection count to fix a data race. (jpillora#342)

Co-authored-by: andres-portainer <[email protected]>

* fix: small typo error in main.go (jpillora#334)

* Respond to /health and /version by request path rather than by the whole url string (jpillora#328)

Co-authored-by: bar <[email protected]>

* Update version.go (jpillora#288)

* Providing chisel's client with a logger level (jpillora#281)

Co-authored-by: Barak Sharoni <[email protected]>
Co-authored-by: barak-sharoni-velocity <[email protected]>

* add EnvBool

* Fix jpillora#390: Use code to generate certificates for client & server (jpillora#400)

* docker alpine->google-distroless

* docker to use scratch

* Fix missing NetDialContext: c.config.DialContext (jpillora#398)

* actions: setup go v3

* switch to scratch image

* update dependabot

* move chisel to flyio

* Bump to Go 1.21 (jpillora#440)

Co-authored-by: cmeng <[email protected]>

* add arm v5 builds (jpillora#395)

* Sync with upstream

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Pratik Raj <[email protected]>
Co-authored-by: ip-rw <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pratik Raj <[email protected]>
Co-authored-by: Jaime Pillora <[email protected]>
Co-authored-by: fsiegmund <[email protected]>
Co-authored-by: andres-portainer <[email protected]>
Co-authored-by: andres-portainer <[email protected]>
Co-authored-by: 0xflotus <[email protected]>
Co-authored-by: BigSully <[email protected]>
Co-authored-by: bar <[email protected]>
Co-authored-by: invist <[email protected]>
Co-authored-by: zuzgon <[email protected]>
Co-authored-by: Barak Sharoni <[email protected]>
Co-authored-by: barak-sharoni-velocity <[email protected]>
Co-authored-by: Jaime Pillora <[email protected]>
Co-authored-by: Guillaume SMAHA <[email protected]>
Co-authored-by: cmeng <[email protected]>
Co-authored-by: maurerr <[email protected]>
@WaysonWei WaysonWei mentioned this pull request Mar 18, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cmenginnz cmenginnz cmenginnz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jpillora @cmenginnz