Skip to content

ServiceAuth and NullAuth #512

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

Merged
merged 2 commits into from
May 29, 2025
Merged

ServiceAuth and NullAuth #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cee05de
ServiceAuth and NullAuth
ZenGround0 May 28, 2025
268c6fd
fix
ZenGround0 May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions pdp/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,30 @@ import (
"strings"

"github.com/golang-jwt/jwt/v4"

"github.com/filecoin-project/curio/harmony/harmonydb"
)

// verifyJWTToken extracts and verifies the JWT token from the request and returns the serviceID.
func (p *PDPService) verifyJWTToken(r *http.Request) (string, error) {
type Auth interface {
AuthService(r *http.Request) (string, error)
}

type NullAuth struct{}

var _ Auth = (*NullAuth)(nil)

func (a *NullAuth) AuthService(r *http.Request) (string, error) {
Copy link
Contributor

@aarshkshah1992 aarshkshah1992 May 29, 2025

Choose a reason for hiding this comment

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

@ZenGround0 So this means auth always goes through right ? Since error is always nill

Copy link
Collaborator Author

@ZenGround0 ZenGround0 May 29, 2025

Choose a reason for hiding this comment

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

exactly

return "public", nil
}

type JWTAuth struct {
db *harmonydb.DB
}

var _ Auth = (*JWTAuth)(nil)

// JWTAuth extracts and verifies the JWT token from the request and returns the serviceID.
func (a *JWTAuth) AuthService(r *http.Request) (string, error) {
// Get the Authorization header
authHeader := r.Header.Get("Authorization")
if authHeader == "" {
Expand Down Expand Up @@ -63,7 +83,7 @@ func (p *PDPService) verifyJWTToken(r *http.Request) (string, error) {
// Query the database for the public key using serviceID
var pubKeyBytes []byte
ctx := r.Context()
err := p.db.QueryRow(ctx, `
err := a.db.QueryRow(ctx, `
SELECT pubkey FROM pdp_services WHERE service_label=$1
`, service).Scan(&pubKeyBytes)
if err != nil {
Expand Down
14 changes: 8 additions & 6 deletions pdp/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ const PDPRoutePath = "/pdp"

// PDPService represents the service for managing proof sets and pieces
type PDPService struct {
Auth
db *harmonydb.DB
storage paths.StashStore

Expand All @@ -53,6 +54,7 @@ type PDPServiceNodeApi interface {
// NewPDPService creates a new instance of PDPService with the provided stores
func NewPDPService(db *harmonydb.DB, stor paths.StashStore, ec *ethclient.Client, fc PDPServiceNodeApi, sn *message.SenderETH) *PDPService {
return &PDPService{
Auth: &NullAuth{},
db: db,
storage: stor,

Expand Down Expand Up @@ -115,7 +117,7 @@ func Routes(r *chi.Mux, p *PDPService) {

func (p *PDPService) handlePing(w http.ResponseWriter, r *http.Request) {
// Verify that the request is authorized using ECDSA JWT
_, err := p.verifyJWTToken(r)
_, err := p.AuthService(r)
if err != nil {
http.Error(w, "Unauthorized: "+err.Error(), http.StatusUnauthorized)
return
Expand All @@ -130,7 +132,7 @@ func (p *PDPService) handleCreateProofSet(w http.ResponseWriter, r *http.Request
ctx := r.Context()

// Step 1: Verify that the request is authorized using ECDSA JWT
serviceLabel, err := p.verifyJWTToken(r)
serviceLabel, err := p.AuthService(r)
if err != nil {
http.Error(w, "Unauthorized: "+err.Error(), http.StatusUnauthorized)
return
Expand Down Expand Up @@ -283,7 +285,7 @@ func (p *PDPService) handleGetProofSetCreationStatus(w http.ResponseWriter, r *h
ctx := r.Context()

// Step 1: Verify that the request is authorized using ECDSA JWT
serviceLabel, err := p.verifyJWTToken(r)
serviceLabel, err := p.AuthService(r)
if err != nil {
http.Error(w, "Unauthorized: "+err.Error(), http.StatusUnauthorized)
return
Expand Down Expand Up @@ -408,7 +410,7 @@ func (p *PDPService) handleGetProofSet(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()

// Step 1: Verify that the request is authorized using ECDSA JWT
serviceLabel, err := p.verifyJWTToken(r)
serviceLabel, err := p.AuthService(r)
if err != nil {
http.Error(w, "Unauthorized: "+err.Error(), http.StatusUnauthorized)
return
Expand Down Expand Up @@ -533,7 +535,7 @@ func (p *PDPService) handleAddRootToProofSet(w http.ResponseWriter, r *http.Requ
ctx := r.Context()

// Step 1: Verify that the request is authorized using ECDSA JWT
serviceLabel, err := p.verifyJWTToken(r)
serviceLabel, err := p.AuthService(r)
if err != nil {
http.Error(w, "Unauthorized: "+err.Error(), http.StatusUnauthorized)
return
Expand Down Expand Up @@ -919,7 +921,7 @@ func (p *PDPService) handleAddRootToProofSet(w http.ResponseWriter, r *http.Requ
func (p *PDPService) handleDeleteProofSetRoot(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
// Step 1: Verify that the request is authorized using ECDSA JWT
serviceLabel, err := p.verifyJWTToken(r)
serviceLabel, err := p.AuthService(r)
if err != nil {
http.Error(w, "Unauthorized: "+err.Error(), http.StatusUnauthorized)
return
Expand Down
4 changes: 2 additions & 2 deletions pdp/handlers_upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (ph *PieceHash) maybeStaticCommp() (cid.Cid, bool) {

func (p *PDPService) handlePiecePost(w http.ResponseWriter, r *http.Request) {
// Verify that the request is authorized using ECDSA JWT
serviceID, err := p.verifyJWTToken(r)
serviceID, err := p.AuthService(r)
if err != nil {
http.Error(w, "Unauthorized: "+err.Error(), http.StatusUnauthorized)
return
Expand Down Expand Up @@ -448,7 +448,7 @@ func (p *PDPService) handlePieceUpload(w http.ResponseWriter, r *http.Request) {
// query parameters
func (p *PDPService) handleFindPiece(w http.ResponseWriter, r *http.Request) {
// Verify that the request is authorized using ECDSA JWT
_, err := p.verifyJWTToken(r)
_, err := p.AuthService(r)
if err != nil {
http.Error(w, "Unauthorized: "+err.Error(), http.StatusUnauthorized)
return
Expand Down