-
Notifications
You must be signed in to change notification settings - Fork 29
fix(LicenseDB): correct UUID nil checks, OIDC base64url decoding, sim… #216
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.
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
Open
shaheemazmalmmd
wants to merge
1
commit into
main
Choose a base branch
from
refactor/licenseDb-UUID
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -672,26 +672,19 @@ func Populatedb(datafile string) { | |
| } | ||
| } | ||
|
|
||
| // SetSimilarityThreshold parses the env var and sets the threshold in Postgres. | ||
| func SetSimilarityThreshold() { | ||
| defaultThreshold := 0.7 | ||
| thresholdStr := os.Getenv("SIMILARITY_THRESHOLD") | ||
|
|
||
| threshold := defaultThreshold | ||
| if thresholdStr != "" { | ||
| if parsed, err := strconv.ParseFloat(thresholdStr, 64); err == nil { | ||
| threshold = parsed | ||
| } else { | ||
| log.Printf("Invalid SIMILARITY_THRESHOLD '%s', using default %.1f", thresholdStr, defaultThreshold) | ||
| } | ||
| } else { | ||
| log.Printf("SIMILARITY_THRESHOLD not set, using default %.1f", defaultThreshold) | ||
| } | ||
|
|
||
| query := fmt.Sprintf("SET pg_trgm.similarity_threshold = %f", threshold) | ||
| if err := db.DB.Exec(query).Error; err != nil { | ||
| log.Println("Failed to set similarity threshold:", err) | ||
| // GetSimilarityThreshold parses the env var and returns the threshold value. | ||
| func GetSimilarityThreshold() float64 { | ||
| const defaultThreshold = 0.7 | ||
| thresholdStr := strings.TrimSpace(os.Getenv("SIMILARITY_THRESHOLD")) | ||
| if thresholdStr == "" { | ||
| return defaultThreshold | ||
| } | ||
| parsed, err := strconv.ParseFloat(thresholdStr, 64) | ||
| if err != nil { | ||
| log.Printf("Invalid SIMILARITY_THRESHOLD '%s', using default %.1f", thresholdStr, defaultThreshold) | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. zap logger must be used |
||
| return defaultThreshold | ||
| } | ||
| return parsed | ||
| } | ||
|
|
||
| // GetAuditEntity is an utility function to fetch obligation or license associated with an audit | ||
|
|
@@ -792,7 +785,7 @@ func GetKid(token string) (string, error) { | |
|
|
||
| parts := strings.Split(token, ".") | ||
|
|
||
| decodedBytes, err := base64.StdEncoding.DecodeString(parts[0]) | ||
| decodedBytes, err := base64.RawURLEncoding.DecodeString(parts[0]) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
zap logger must be used and in this implementation, function won't stop execution after an error