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.

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

(DAL) Update dal key validation #1747

Merged
merged 1 commit into from
Jul 8, 2024
Merged

Conversation

nick-bisonai
Copy link
Collaborator

Description

Use Keyauth instead of manual implementation.
Adds test to check if it fails to get result without proper api key header.

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Checklist before requesting a review

  • I have performed a self-review of my code.
  • If it is a core feature, I have added thorough tests.

Deployment

  • Should publish npm package
  • Should publish Docker image

@nick-bisonai nick-bisonai self-assigned this Jul 8, 2024
@nick-bisonai nick-bisonai requested a review from a team as a code owner July 8, 2024 06:22
Copy link
Contributor

coderabbitai bot commented Jul 8, 2024

Walkthrough

Walkthrough

The recent updates entail enhancing API security by integrating a new API key validator within the middleware in utils.go. Additionally, a new test function TestShouldFailWithoutApiKey was introduced in api_test.go to ensure that requests without an API key are correctly handled and receive a 401 status code.

Changes

File Change Summary
node/pkg/dal/tests/api_test.go Added the TestShouldFailWithoutApiKey test function and imported the request package.
node/pkg/dal/utils/utils.go Replaced APIKeyMiddleware with a validator function using keyauth.New for API key validation.

Sequence Diagram(s)

sequenceDiagram
    participant Client
    participant Middleware
    participant API
    
    Client->>+API: Request without API Key
    API->>+Middleware: Validate API Key
    Middleware-->>-API: Validation Failed (401)
    API-->>-Client: 401 Unauthorized
Loading

Poem

In lines of code that intertwine,
A safeguard for the key to shine.
A test to catch the chances slight,
When no key's there, it blocks the flight.
We build a fort with heart and might,
And sleep at ease through every night.

🐇🚀


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

Outside diff range and nitpick comments (2)
node/pkg/dal/utils/utils.go (1)

21-31: Consider adding logging for failed validation attempts.

The validator function correctly implements the validation logic. Adding logging can help in monitoring and debugging.

func validator(ctx *fiber.Ctx, s string) (bool, error) {
	key := os.Getenv("API_KEY")
	if s == "" {
		log.Warn().Msg("missing api key")
		return false, fmt.Errorf("missing api key")
	}

	if s == key {
		return true, nil
	}

	log.Warn().Msg("invalid api key")
	return false, fmt.Errorf("invalid api key")
}
node/pkg/dal/tests/api_test.go (1)

82-103: Consider adding a cleanup step to stop the server after the test.

The TestShouldFailWithoutApiKey function is well-written and correctly tests the intended scenario. Adding a cleanup step to stop the server can prevent potential issues with subsequent tests.

func TestShouldFailWithoutApiKey(t *testing.T) {
	ctx := context.Background()
	clean, testItems, err := setup(ctx)
	if err != nil {
		t.Fatalf("error setting up test: %v", err)
	}
	defer func() {
		if cleanupErr := clean(); cleanupErr != nil {
			t.Logf("Cleanup failed: %v", cleanupErr)
		}
	}()

	testItems.Controller.Start(ctx)
	go testItems.App.Listen(":8090")
	defer testItems.App.Shutdown() // Add this line for cleanup

	resp, err := request.RequestRaw(request.WithEndpoint("http://localhost:8090/api/v1"))

	if err != nil {
		t.Fatalf("error getting latest data: %v", err)
	}

	assert.Equal(t, 401, resp.StatusCode)
}
Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 62cf6a9 and a32c14f.

Files selected for processing (2)
  • node/pkg/dal/tests/api_test.go (2 hunks)
  • node/pkg/dal/utils/utils.go (2 hunks)
Additional comments not posted (3)
node/pkg/dal/utils/utils.go (2)

16-16: Import statement for keyauth middleware is correct.

The import statement is necessary for the new functionality.


61-64: Usage of keyauth middleware is correct.

The keyauth middleware is correctly configured to use the validator function and integrates well within the Setup function.

node/pkg/dal/tests/api_test.go (1)

14-14: Import statement for request package is correct.

The import statement is necessary for the new test functionality.

@nick-bisonai nick-bisonai merged commit 91cf5b3 into master Jul 8, 2024
2 checks passed
@nick-bisonai nick-bisonai deleted the feat/update-key-validation branch July 8, 2024 06:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant