Skip to content
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

Add not present condition for content-type #55

Merged
merged 2 commits into from
Sep 3, 2024
Merged

Add not present condition for content-type #55

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0132b3
bearer: Add not present condition for content-type
smallhive Aug 15, 2024
df7c41b
bearer: Refactor EACL table record creation
smallhive Sep 3, 2024
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
67 changes: 46 additions & 21 deletions bearer/bearer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ type Generator struct {
config *Config
}

type newRecordFun func() *eacl.Record

// NewGenerator creates new bearer token generator using config.
func NewGenerator(config *Config) *Generator {
return &Generator{config: config}
Expand All @@ -36,32 +38,55 @@ type Config struct {
ObjectMaxLifetime time.Duration
}

func (b *Generator) createRecords(hashedEmail string, currentEpoch uint64, msPerEpoch int64) []newRecordFun {
records := []newRecordFun{
func() *eacl.Record {
rec := eacl.CreateRecord(eacl.ActionDeny, eacl.OperationPut)
rec.AddFilter(eacl.HeaderFromObject, eacl.MatchNotPresent, object.AttributeContentType, "")

return rec
},
func() *eacl.Record {
epochs := uint64(b.config.ObjectMaxLifetime.Milliseconds() / msPerEpoch)
maxExpirationEpoch := strconv.FormatUint(currentEpoch+b.config.LifeTime+epochs, 10)

// order of rec is important
rec := eacl.CreateRecord(eacl.ActionAllow, eacl.OperationPut)
rec.AddObjectAttributeFilter(eacl.MatchStringEqual, b.config.EmailAttr, hashedEmail)
rec.AddFilter(eacl.HeaderFromObject, eacl.MatchStringNotEqual, object.AttributeContentType, "application/javascript")
rec.AddFilter(eacl.HeaderFromObject, eacl.MatchStringNotEqual, object.AttributeContentType, "text/javascript")
rec.AddFilter(eacl.HeaderFromObject, eacl.MatchStringNotEqual, object.AttributeContentType, "application/xhtml+xml")
rec.AddFilter(eacl.HeaderFromObject, eacl.MatchStringNotEqual, object.AttributeContentType, "text/html")
rec.AddFilter(eacl.HeaderFromObject, eacl.MatchStringNotEqual, object.AttributeContentType, "text/htmlh")
rec.AddFilter(eacl.HeaderFromObject, eacl.MatchStringNotEqual, object.AttributeContentType, "")
rec.AddObjectPayloadLengthFilter(eacl.MatchNumLE, b.config.MaxObjectSize)
rec.AddFilter(eacl.HeaderFromObject, eacl.MatchNumLE, object.AttributeExpirationEpoch, maxExpirationEpoch)

return rec
},
func() *eacl.Record {
rec := eacl.CreateRecord(eacl.ActionDeny, eacl.OperationPut)
eacl.AddFormedTarget(rec, eacl.RoleOthers)

return rec
},
}

return records
}

// NewBearer generates new token for supplied email.
func (b *Generator) NewBearer(email string, currentEpoch uint64, msPerEpoch int64) (string, string, error) {
hashedEmail := fmt.Sprintf("%x", sha256.Sum256([]byte(email)))

epochs := uint64(b.config.ObjectMaxLifetime.Milliseconds() / msPerEpoch)

records := b.createRecords(hashedEmail, currentEpoch, msPerEpoch)
t := eacl.CreateTable(b.config.ContainerID)
// order of rec is important
rec := eacl.CreateRecord(eacl.ActionAllow, eacl.OperationPut)
rec.AddObjectAttributeFilter(eacl.MatchStringEqual, b.config.EmailAttr, hashedEmail)
rec.AddFilter(eacl.HeaderFromObject, eacl.MatchStringNotEqual, object.AttributeContentType, "application/javascript")
rec.AddFilter(eacl.HeaderFromObject, eacl.MatchStringNotEqual, object.AttributeContentType, "text/javascript")
rec.AddFilter(eacl.HeaderFromObject, eacl.MatchStringNotEqual, object.AttributeContentType, "application/xhtml+xml")
rec.AddFilter(eacl.HeaderFromObject, eacl.MatchStringNotEqual, object.AttributeContentType, "text/html")
rec.AddFilter(eacl.HeaderFromObject, eacl.MatchStringNotEqual, object.AttributeContentType, "text/htmlh")
rec.AddFilter(eacl.HeaderFromObject, eacl.MatchStringNotEqual, object.AttributeContentType, "")
rec.AddObjectPayloadLengthFilter(eacl.MatchNumLE, b.config.MaxObjectSize)

maxExpirationEpoch := strconv.FormatUint(currentEpoch+b.config.LifeTime+epochs, 10)
rec.AddFilter(eacl.HeaderFromObject, eacl.MatchNumLE, object.AttributeExpirationEpoch, maxExpirationEpoch)

eacl.AddFormedTarget(rec, eacl.RoleOthers)
t.AddRecord(rec)
rec2 := eacl.CreateRecord(eacl.ActionDeny, eacl.OperationPut)
eacl.AddFormedTarget(rec2, eacl.RoleOthers)
t.AddRecord(rec2)

for _, record := range records {
rec := record()
eacl.AddFormedTarget(rec, eacl.RoleOthers)
t.AddRecord(rec)
}

var bt bearer.Token
bt.SetEACLTable(*t)
Expand Down
Loading