diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2022-01-01 22:34:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-01 22:34:13 -0800 |
| commit | 9b941773805400c520558d83aed633adc821988c (patch) | |
| tree | 55cac459c1219bf7b8a50049572260917634ccfc /weed/server/filer_server.go | |
| parent | 34742be0295998c2105a5ee50e3e77ef2397c403 (diff) | |
| parent | 99abddf3769a5e4a25c72e67df9106e41b7aa8f3 (diff) | |
| download | seaweedfs-9b941773805400c520558d83aed633adc821988c.tar.xz seaweedfs-9b941773805400c520558d83aed633adc821988c.zip | |
Merge pull request #2543 from skurfuerst/seaweedfs-158
FEATURE: add JWT to HTTP endpoints of Filer and use them in S3 Client
Diffstat (limited to 'weed/server/filer_server.go')
| -rw-r--r-- | weed/server/filer_server.go | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index 1a5f80369..da385a116 100644 --- a/weed/server/filer_server.go +++ b/weed/server/filer_server.go @@ -71,6 +71,7 @@ type FilerServer struct { option *FilerOption secret security.SigningKey filer *filer.Filer + filerGuard *security.Guard grpcDialOption grpc.DialOption // metrics read from the master @@ -90,6 +91,15 @@ type FilerServer struct { func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption) (fs *FilerServer, err error) { + v := util.GetViper() + signingKey := v.GetString("jwt.filer_signing.key") + v.SetDefault("jwt.filer_signing.expires_after_seconds", 10) + expiresAfterSec := v.GetInt("jwt.filer_signing.expires_after_seconds") + + readSigningKey := v.GetString("jwt.filer_signing.read.key") + v.SetDefault("jwt.filer_signing.read.expires_after_seconds", 60) + readExpiresAfterSec := v.GetInt("jwt.filer_signing.read.expires_after_seconds") + fs = &FilerServer{ option: option, grpcDialOption: security.LoadClientTLS(util.GetViper(), "grpc.filer"), @@ -106,13 +116,14 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption) fs.listenersCond.Broadcast() }) fs.filer.Cipher = option.Cipher + // we do not support IP whitelist right now + fs.filerGuard = security.NewGuard([]string{}, signingKey, expiresAfterSec, readSigningKey, readExpiresAfterSec) fs.checkWithMaster() go stats.LoopPushingMetric("filer", string(fs.option.Host), fs.metricsAddress, fs.metricsIntervalSec) go fs.filer.KeepMasterClientConnected() - v := util.GetViper() if !util.LoadConfiguration("filer", false) { v.Set("leveldb2.enabled", true) v.Set("leveldb2.dir", option.DefaultLevelDbDir) |