r.loginov/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Pull requests Activity

[#8] Turn on creds and manager

Browse source 
Signed-off-by: Pavel Korotkov <pkorotkov@gmail.com>
This commit is contained in:
Pavel Korotkov 2020-08-06 18:09:45 +03:00
parent 4f7a2f3a9a
commit fdc6d7acbd
1 changed files with 15 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
auth/center.go
View file

@ -11,6 +11,7 @@ import (
"github.com/nspcc-dev/neofs-api-go/refs" "github.com/nspcc-dev/neofs-api-go/refs"
"github.com/nspcc-dev/neofs-api-go/service" "github.com/nspcc-dev/neofs-api-go/service"
"github.com/nspcc-dev/neofs-authmate/accessbox/hcs" "github.com/nspcc-dev/neofs-authmate/accessbox/hcs"
"github.com/nspcc-dev/neofs-authmate/credentials"
"github.com/nspcc-dev/neofs-authmate/gates" "github.com/nspcc-dev/neofs-authmate/gates"
manager "github.com/nspcc-dev/neofs-authmate/neofsmanager" manager "github.com/nspcc-dev/neofs-authmate/neofsmanager"
crypto "github.com/nspcc-dev/neofs-crypto" crypto "github.com/nspcc-dev/neofs-crypto"
@ -26,12 +27,7 @@ const emptyStringSHA256 = `e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca4959
type Center struct { type Center struct {
log *zap.Logger log *zap.Logger
submatcher *regexpSubmatcher submatcher *regexpSubmatcher
neofsKeys struct { neofsCredentials *credentials.Credentials
PrivateKey *ecdsa.PrivateKey
PublicKey *ecdsa.PublicKey
}
ownerID refs.OwnerID
wifString string
manager *manager.Manager manager *manager.Manager
authKeys *hcs.X25519Keys authKeys *hcs.X25519Keys
} }
@ -50,36 +46,19 @@ func NewCenter(log *zap.Logger, neofsNodeAddress string) (*Center, error) {
} }
func (center *Center) SetNeoFSKeys(key *ecdsa.PrivateKey) error { func (center *Center) SetNeoFSKeys(key *ecdsa.PrivateKey) error {
publicKey := &key.PublicKey // TODO: Change when credentials will start taking not just a string.
oid, err := refs.NewOwnerID(publicKey) wif, _ := crypto.WIFEncode(key)
if err != nil { creds, _ := credentials.NewCredentials(wif)
return errors.Wrap(err, "failed to get OwnerID") center.neofsCredentials = creds
}
center.neofsKeys.PrivateKey = key
wif, err := crypto.WIFEncode(key)
if err != nil {
return errors.Wrap(err, "failed to get WIF string from given key")
}
center.neofsKeys.PublicKey = publicKey
center.ownerID = oid
center.wifString = wif
return nil return nil
} }
func (center *Center) GetNeoFSPrivateKey() *ecdsa.PrivateKey { func (center *Center) GetNeoFSPrivateKey() *ecdsa.PrivateKey {
return center.neofsKeys.PrivateKey return center.neofsCredentials.Key()
}
func (center *Center) GetNeoFSPublicKey() *ecdsa.PublicKey {
return center.neofsKeys.PublicKey
} }
func (center *Center) GetOwnerID() refs.OwnerID { func (center *Center) GetOwnerID() refs.OwnerID {
return center.ownerID return center.neofsCredentials.OwnerID()
}
func (center *Center) GetWIFString() string {
return center.wifString
} }
func (center *Center) SetUserAuthKeys(key hcs.X25519PrivateKey) error { func (center *Center) SetUserAuthKeys(key hcs.X25519PrivateKey) error {
@ -149,21 +128,14 @@ func (center *Center) AuthenticationPassed(request *http.Request) (*service.Bear
} }
func (center *Center) fetchBearerToken(accessKeyID string) (*service.BearerTokenMsg, string, error) { func (center *Center) fetchBearerToken(accessKeyID string) (*service.BearerTokenMsg, string, error) {
// TODO: Turn it into getting bearer token from NeoFS node later on.
// accessKeyID = "051d729a102513387b63f2f07a5cd45ca3158b273646527916cc3f705fa0006b249e038f4e4b4986d85b18358da8692819ef6e35063e91efce17da32d956ad9e48d2674f0cab2bd5ff27b49cb9a1b0e71eb73d330b6cd8f23e85252e55afe992765b2983ee2bafc57079221fdc8e48a3f5d8b0be87a259fd12c6afd59e3ec748c8677a4211c8d6ec7b67008a006f526b22a8536effe8ecb6581ea16d7f9358ede53dddf36fb589ab9a829b81d9c69d19a4b9d1ac58d5e9311e3608eb233475bfc47a02633c5611d1bb3b9450ef00b2490924be5f3375e3eb4b6ed2f23906f183c213e77c19ec5c62b3be3a5a5b526851ea674c613b542c2861fd4a5178b65d8df8899a05b25db8b9e15f5e257467044e41b69144fe4b802aff2a56c8960e5e3c7eb004d41a6d873f927db43ed047171f36cda5be080e0df2ddfe15edb423b41491559a7a5cc70932566cdd71058913abb0a68d3c1ac50586f0a48b02e1cea24ca8a2010d5495dbc5daf0575413c06542a16288664104ad06289a5b2bf119071171562dcdc05d6b9260df2fc676540fc1d836c36f77a090cc5ce52b930f74ae625d53e1a80b7a59aa2d85e2f188c131de5739bf0e49e6d5f081e757f2b0d85a8264dfb66c4400bcd4727d7c21eca92c138d975fe51f986e80ec32ba13e8850c82dd813cd45640caa303555e0759d0d111dac6cc39cbe711dd56dc8f01a6022635"
// secretAccessKey := "12775ab859000dd87b3c7586146f465efc73bbbd33ac3b36f2ab2b061df15f7b"
// bearerToken, _, err := center.unpackBearerToken(accessKeyID)
// if err != nil {
// return nil, "", errors.Wrap(err, "failed to fetch bearer token")
// }
akid := new(refs.Address) akid := new(refs.Address)
if err := akid.Parse(accessKeyID); err != nil { if err := akid.Parse(accessKeyID); err != nil {
return nil, "", errors.Wrap(err, "failed to parse access key id as refs.Address") return nil, "", errors.Wrap(err, "failed to parse access key id as refs.Address")
} }
config := &gates.ObtainingConfig{ config := &gates.ObtainingConfig{
BaseConfig: gates.BaseConfig{ BaseConfig: gates.BaseConfig{
OperationalCredentials: nil, OperationalCredentials: center.neofsCredentials,
Manager: nil, Manager: center.manager,
}, },
GateKeys: center.authKeys, GateKeys: center.authKeys,
SecretAddress: akid, SecretAddress: akid,
@ -194,9 +166,8 @@ func LoadGateAuthPrivateKey(path string) (hcs.X25519PrivateKey, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
// FIXME: Rework when DecodeKeysFromBytes will arrive.
key := string(bytes) key := string(bytes)
privateKey, _, err := hcs.DecodeKeys(&key, nil) privateKey, _, err := hcs.DecodeKeysFromStrings(&key, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }