Skip to content

Commit

Permalink
Merge pull request #4894 from cs3org/fix/eos-grpc
Browse files Browse the repository at this point in the history
Do not include HTTPS cert in EOS HTTP Client
  • Loading branch information
jessegeens authored Oct 21, 2024
2 parents 716e6b8 + 5fda82d commit d2b2c10
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 21 deletions.
8 changes: 8 additions & 0 deletions changelog/unreleased/no-certs-eos-http-client.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Bugfix: no certs in EOS HTTP client

Omit HTTPS cert in EOS HTTP Client, as this causes authentication issues on EOS < 5.2.28.
When EOS receives a certificate, it will look for this cert in the gridmap file.
If it is not found there, the whole authn flow is aborted and the user is mapped to nobody.


https://github.com/cs3org/reva/pull/4894
21 changes: 0 additions & 21 deletions pkg/eosclient/eosgrpc/eoshttp.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ package eosgrpc
import (
"bytes"
"context"
"crypto/tls"
"errors"
"fmt"
"io"
"net/http"
Expand Down Expand Up @@ -148,10 +146,6 @@ func NewEOSHTTPClient(opt *HTTPOptions) (*EOSHTTPClient, error) {
}

opt.init()
baseUrl, err := url.Parse(opt.BaseURL)
if err != nil {
return nil, errors.New("Failed to parse BaseURL")
}

t := &http.Transport{
MaxIdleConns: opt.MaxIdleConns,
Expand All @@ -161,21 +155,6 @@ func NewEOSHTTPClient(opt *HTTPOptions) (*EOSHTTPClient, error) {
DisableCompression: true,
}

if baseUrl.Scheme == "https" {
cert, err := tls.LoadX509KeyPair(opt.ClientCertFile, opt.ClientKeyFile)
if err != nil {
return nil, err
}
t.TLSClientConfig = &tls.Config{
Certificates: []tls.Certificate{cert},
}
}

// TODO: the error reporting of http.transport is insufficient
// we may want to check manually at least the existence of the certfiles
// The point is that also the error reporting of the context that calls this function
// is weak

cl := &http.Client{
Transport: t,
CheckRedirect: func(req *http.Request, via []*http.Request) error {
Expand Down

0 comments on commit d2b2c10

Please sign in to comment.