remove JwtAuthAPI (#4837)

filecoin-project · Mar 22, 2022 · 5ceac1c · 5ceac1c
1 parent 89c6d12
commit 5ceac1c
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 226 deletions.
diff --git a/pkg/jwtauth/local_jwt.go b/pkg/jwtauth/local_jwt.go
@@ -89,24 +89,3 @@ func (jwtAuth *JwtAuth) Verify(ctx context.Context, token string) ([]auth.Permis
 	}
 	return payload.Allow, nil
 }
-
-type JwtAuthAPI struct { // nolint
-	JwtAuth *JwtAuth
-}
-
-// Verify check the token is valid or not
-func (a *JwtAuthAPI) Verify(ctx context.Context, token string) ([]auth.Permission, error) {
-	var payload JwtPayload
-	if _, err := jwt3.Verify([]byte(token), (*jwt3.HMACSHA)(a.JwtAuth.apiSecret), &payload); err != nil {
-		return nil, xerrors.Errorf("JWT Verification failed: %v", err)
-	}
-	return payload.Allow, nil
-}
-
-// AuthNew create new token with specify permission for access venus
-func (a *JwtAuthAPI) AuthNew(ctx context.Context, perms []auth.Permission) ([]byte, error) {
-	p := JwtPayload{
-		Allow: perms, // TODO: consider checking validity
-	}
-	return jwt3.Sign(&p, (*jwt3.HMACSHA)(a.JwtAuth.apiSecret))
-}
diff --git a/venus-shared/api/chain/v0/fullnode.go b/venus-shared/api/chain/v0/fullnode.go
@@ -11,5 +11,4 @@ type FullNode interface {
 	IPaychan
 	ISyncer
 	IWallet
-	IJwtAuthAPI
 }
diff --git a/venus-shared/api/chain/v0/jwtauth.go b/venus-shared/api/chain/v0/jwtauth.go
diff --git a/venus-shared/api/chain/v0/method.md b/venus-shared/api/chain/v0/method.md
@@ -48,9 +48,6 @@
   * [StateWaitMsg](#StateWaitMsg)
   * [StateWaitMsgLimited](#StateWaitMsgLimited)
   * [VerifyEntry](#VerifyEntry)
-* [JwtAuth](#JwtAuth)
-  * [AuthNew](#AuthNew)
-  * [Verify](#Verify)
 * [Market](#Market)
   * [StateMarketParticipants](#StateMarketParticipants)
 * [MessagePool](#MessagePool)
@@ -1528,44 +1525,6 @@ Inputs:
 
 Response: `true`
 
-## JwtAuth
-
-### AuthNew
-
-
-Perms: admin
-
-Inputs:
-```json
-[
-  [
-    "string value"
-  ]
-]
-```
-
-Response: `"Ynl0ZSBhcnJheQ=="`
-
-### Verify
-
-
-Perms: read
-
-Inputs:
-```json
-[
-  "string value",
-  "string value"
-]
-```
-
-Response:
-```json
-[
-  "string value"
-]
-```
-
 ## Market
 
 ### StateMarketParticipants

diff --git a/venus-shared/api/chain/v0/mock/mock_fullnode.go b/venus-shared/api/chain/v0/mock/mock_fullnode.go
diff --git a/venus-shared/api/chain/v0/proxy_gen.go b/venus-shared/api/chain/v0/proxy_gen.go
diff --git a/venus-shared/api/chain/v1/fullnode.go b/venus-shared/api/chain/v1/fullnode.go
@@ -11,5 +11,4 @@ type FullNode interface {
 	IPaychan
 	ISyncer
 	IWallet
-	IJwtAuthAPI
 }
diff --git a/venus-shared/api/chain/v1/jwtauth.go b/venus-shared/api/chain/v1/jwtauth.go
diff --git a/venus-shared/api/chain/v1/method.md b/venus-shared/api/chain/v1/method.md
@@ -48,9 +48,6 @@
   * [StateVerifierStatus](#StateVerifierStatus)
   * [StateWaitMsg](#StateWaitMsg)
   * [VerifyEntry](#VerifyEntry)
-* [JwtAuth](#JwtAuth)
-  * [AuthNew](#AuthNew)
-  * [Verify](#Verify)
 * [Market](#Market)
   * [StateMarketParticipants](#StateMarketParticipants)
 * [MessagePool](#MessagePool)
@@ -1544,44 +1541,6 @@ Inputs:
 
 Response: `true`
 
-## JwtAuth
-
-### AuthNew
-
-
-Perms: admin
-
-Inputs:
-```json
-[
-  [
-    "string value"
-  ]
-]
-```
-
-Response: `"Ynl0ZSBhcnJheQ=="`
-
-### Verify
-
-
-Perms: read
-
-Inputs:
-```json
-[
-  "string value",
-  "string value"
-]
-```
-
-Response:
-```json
-[
-  "string value"
-]
-```
-
 ## Market
 
 ### StateMarketParticipants

diff --git a/venus-shared/api/chain/v1/mock/mock_fullnode.go b/venus-shared/api/chain/v1/mock/mock_fullnode.go
diff --git a/venus-shared/api/chain/v1/proxy_gen.go b/venus-shared/api/chain/v1/proxy_gen.go
diff --git a/venus-shared/compatible-checks/api-diff.txt b/venus-shared/compatible-checks/api-diff.txt
@@ -1,4 +1,5 @@
 github.com/filecoin-project/venus/venus-shared/api/chain/v0.FullNode <> github.com/filecoin-project/lotus/api/v0api.FullNode:
+	- AuthNew
 	- AuthVerify
 	+ BlockTime
 	> ChainExport {[func(context.Context, abi.ChainEpoch, bool, types.TipSetKey) (<-chan []uint8, error) <> func(context.Context, abi.ChainEpoch, bool, types.TipSetKey) (<-chan []uint8, error)] base=func in type: #3 input; nested={[types.TipSetKey <> types.TipSetKey] base=codec marshaler implementations for codec Cbor: true != false; nested=nil}}
@@ -176,7 +177,6 @@ github.com/filecoin-project/venus/venus-shared/api/chain/v0.FullNode <> github.c
 	- SyncValidateTipset
 	+ SyncerTracker
 	+ UnLockWallet
-	+ Verify
 	+ VerifyEntry
 	> Version {[func(context.Context) (types.Version, error) <> func(context.Context) (api.APIVersion, error)] base=func out type: #0 input; nested={[types.Version <> api.APIVersion] base=struct field; nested={[types.Version <> api.APIVersion] base=exported fields count: 2 != 3; nested=nil}}}
 	+ WalletAddresses
@@ -191,6 +191,7 @@ github.com/filecoin-project/venus/venus-shared/api/chain/v0.FullNode <> github.c
 	- WalletVerify
 
 github.com/filecoin-project/venus/venus-shared/api/chain/v1.FullNode <> github.com/filecoin-project/lotus/api.FullNode:
+	- AuthNew
 	- AuthVerify
 	+ BlockTime
 	- ChainBlockstoreInfo
@@ -369,7 +370,6 @@ github.com/filecoin-project/venus/venus-shared/api/chain/v1.FullNode <> github.c
 	- SyncValidateTipset
 	+ SyncerTracker
 	+ UnLockWallet
-	+ Verify
 	+ VerifyEntry
 	> Version {[func(context.Context) (types.Version, error) <> func(context.Context) (api.APIVersion, error)] base=func out type: #0 input; nested={[types.Version <> api.APIVersion] base=struct field; nested={[types.Version <> api.APIVersion] base=exported fields count: 2 != 3; nested=nil}}}
 	+ WalletAddresses

diff --git a/venus-shared/compatible-checks/api-perm.txt b/venus-shared/compatible-checks/api-perm.txt
@@ -13,8 +13,6 @@ v0: github.com/filecoin-project/venus/venus-shared/api/chain/v0 <> github.com/fi
 	- IChainInfo.VerifyEntry
 	- IMinerState.StateMinerSectorSize
 	- IMinerState.StateMinerWorkerAddress
-	- IJwtAuthAPI.AuthNew
-	- IJwtAuthAPI.Verify
 	- IMessagePool.GasBatchEstimateMessageGas
 	- IMessagePool.MpoolDeleteByAdress
 	- IMessagePool.MpoolPublishByAddr
@@ -60,7 +58,6 @@ v1: github.com/filecoin-project/venus/venus-shared/api/chain/v1 <> github.com/fi
 	- IChainInfo.VerifyEntry
 	- IMinerState.StateMinerSectorSize
 	- IMinerState.StateMinerWorkerAddress
-	- IJwtAuthAPI.Verify
 	- IMessagePool.GasBatchEstimateMessageGas
 	- IMessagePool.MpoolDeleteByAdress
 	- IMessagePool.MpoolPublishByAddr
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,5 +11,4 @@ type FullNode interface { @@
     	IPaychan
     	ISyncer
     	IWallet
-    	IJwtAuthAPI
     }