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

fix: fix acl bug #2714

Merged
merged 3 commits into from
Jun 12, 2024
Merged

fix: fix acl bug #2714

merged 3 commits into from
Jun 12, 2024

Conversation

luky116
Copy link
Collaborator

@luky116 luky116 commented Jun 10, 2024

fix #2713
fix #2712

Summary by CodeRabbit

  • Bug Fixes
    • Corrected the logic for setting user permissions to ensure proper handling of blacklists and passwords.

gukj-spel and others added 2 commits June 4, 2024 21:04
…able (OpenAtomFoundation#2692)

* change cmdId assignment time to assign after intializing cmdtable

* 修改 PikaCmdTableManager中 getCmdId,删除pika_command.cc中多余的头文件引用
Copy link

coderabbitai bot commented Jun 10, 2024

Walkthrough

The changes in src/acl.cc pertain to the Acl::InitLimitUser function, which now correctly sets user permissions based on the presence of a blacklist and password. This ensures that the rules of the acl disable command are enforced, and user passwords are validated even when no blacklist is configured.

Changes

Files Change Summary
src/acl.cc Adjusted logic for setting user permissions and handling password conditions.

Assessment against linked issues

Objective (Issue #) Addressed Explanation
Ensure acl disable command rules take effect on limit (#2713)
Validate userpass even if userblacklist is not configured (#2712)

Poem

In the code where rules align,
Permissions set, all finely twined,
A blacklist here, a password there,
Now users find their access fair.
Bugs are gone, the code refined,
In ACL’s realm, all is defined.


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.

@github-actions github-actions bot added ☢️ Bug Something isn't working Invalid PR Title labels Jun 10, 2024
@luky116 luky116 changed the title fix acl bug fix: fix acl bug Jun 10, 2024
@luky116 luky116 changed the base branch from 4.0 to unstable June 11, 2024 03:53
Copy link

@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: 2

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 38eb16d and ab74c13.

Files selected for processing (1)
  • src/acl.cc (1 hunks)

Comment on lines +497 to +499
}
if (!pass.empty()) {
u->SetUser(">"+pass);
Copy link

Choose a reason for hiding this comment

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

Ensure proper handling of user passwords.

The code sets the user password directly without checking if the password is already set or if it needs to be updated. This could lead to unintended overwrites. Consider adding checks or a method to update the password only if it differs from the current one.


Refactor password setting logic.

The password setting logic in the InitLimitUser method could be refactored into a separate method to improve readability and reusability. This would also make it easier to handle different password setting scenarios more cleanly.

- u->SetUser(">"+pass);
+ u->SetPassword(pass);

Committable suggestion was skipped due to low confidence.

@AlexStocks AlexStocks merged commit 4165526 into OpenAtomFoundation:unstable Jun 12, 2024
15 checks passed
chejinge pushed a commit that referenced this pull request Jun 12, 2024
* fix:  modify cmdId assignment time to assgining after registering cmdtable (#2692)

* change cmdId assignment time to assign after intializing cmdtable

* 修改 PikaCmdTableManager中 getCmdId,删除pika_command.cc中多余的头文件引用

* fix acl bug

---------

Co-authored-by: Kaijie Gu <2459548460@qq.com>
Co-authored-by: liuyuecai <liuyuecai@360.cn>
@coderabbitai coderabbitai bot mentioned this pull request Sep 19, 2024
cheniujh pushed a commit to cheniujh/pika that referenced this pull request Sep 24, 2024
* fix:  modify cmdId assignment time to assgining after registering cmdtable (OpenAtomFoundation#2692)

* change cmdId assignment time to assign after intializing cmdtable

* 修改 PikaCmdTableManager中 getCmdId,删除pika_command.cc中多余的头文件引用

* fix acl bug

---------

Co-authored-by: Kaijie Gu <2459548460@qq.com>
Co-authored-by: liuyuecai <liuyuecai@360.cn>
cheniujh pushed a commit to cheniujh/pika that referenced this pull request Sep 24, 2024
* fix:  modify cmdId assignment time to assgining after registering cmdtable (OpenAtomFoundation#2692)

* change cmdId assignment time to assign after intializing cmdtable

* 修改 PikaCmdTableManager中 getCmdId,删除pika_command.cc中多余的头文件引用

* fix acl bug

---------

Co-authored-by: Kaijie Gu <2459548460@qq.com>
Co-authored-by: liuyuecai <liuyuecai@360.cn>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3.5.5 4.0.0 ☢️ Bug Something isn't working
Projects
None yet
4 participants