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

Jump to bottom

[Bugfix] | GH-1749 -Fixing share expiration task #1750

Merged
merged 5 commits into from
Feb 4, 2025
Merged

[Bugfix] | GH-1749 -Fixing share expiration task #1750

merged 5 commits into from
Feb 4, 2025

Conversation

TejasRGitHub
Copy link
Contributor

@TejasRGitHub TejasRGitHub commented Jan 10, 2025 •
edited
Loading

Feature or Bugfix

  • Bugfix

Detail

  • Simplified the logic for share item state transition
  • Resolved bug by adding

Relates

Testing

  1. Created a share with expiration and all the share items are in Revoke_Succeded state. After running share exp task, no error were thrown ✅
  2. Created a share with expiration and few shares are in Share_Succeeded and few are in Revoke_Succeded state. After running share expiration task, share succeeded items were revoked successfully. ✅
  3. Share with expiration and items in Revoke_succeeded and few in revoke_failed, submitted, then share exp task doesn't process those items and doesn't throw any error ✅

Security

Please answer the questions below briefly where applicable, or write N/A. Based on
OWASP 10.

  • Does this PR introduce or modify any input fields or queries - this includes
    fetching data from storage outside the application (e.g. a database, an S3 bucket)?
    • Is the input sanitized?
    • What precautions are you taking before deserializing the data you consume?
    • Is injection prevented by parametrizing queries?
    • Have you ensured no eval or similar functions are used?
  • Does this PR introduce any functionality or component that requires authorization?
    • How have you ensured it respects the existing AuthN/AuthZ mechanisms?
    • Are you logging failed auth attempts?
  • Are you using or adding any cryptographic features?
    • Do you use a standard proven implementations?
    • Are the used keys controlled by the customer? Where are they stored?
  • Are you introducing any new policies/roles/users?
    • Have you used the least-privilege principle? How?

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@TejasRGitHub TejasRGitHub marked this pull request as ready for review January 10, 2025 21:41
@dlpzx dlpzx requested review from SofiaSazonova and dlpzx January 30, 2025 08:52
dlpzx
dlpzx reviewed Jan 30, 2025
View reviewed changes
backend/dataall/modules/shares_base/db/share_object_repositories.py Outdated
@@ -479,7 +479,7 @@ def fetch_submitted_shares_with_notifications(session):
def get_all_active_shares_with_expiration(session):
return (
session.query(ShareObject)
.filter(and_(ShareObject.expiryDate.isnot(None), ShareObject.deleted.is_(None)))
.filter(and_(ShareObject.expiryDate.isnot(None), ShareObject.deleted.is_(None), ShareObject.status == 'Processed'))
Copy link
Contributor

@dlpzx dlpzx Jan 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Let's use ShareObjectStatus.Processed instead of hardcoding the enum value

dlpzx
dlpzx requested changes Jan 30, 2025
View reviewed changes
Copy link
Contributor

@dlpzx dlpzx left a comment

Choose a reason for hiding this comment

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

Some minor changes. The code looks better with this PR. Thank you!

@TejasRGitHub TejasRGitHub requested a review from dlpzx January 30, 2025 17:14
@TejasRGitHub
Copy link
Contributor Author

Some minor changes. The code looks better with this PR. Thank you!

Hi @dlpzx , Thanks for the review. I have updated the PR to include those changes

@dlpzx
Copy link
Contributor

dlpzx commented Feb 3, 2025

Hi @TejasRGitHub the PR looks good, but there are some conflicts

trajopadhye and others added 2 commits February 3, 2025 12:05
Merge branch 'main' into data-dot-allGH-1749-share-expiration-bug
ef1c943 
# Conflicts:
#	backend/dataall/modules/shares_base/db/share_object_repositories.py
@TejasRGitHub
Resolving conflicting files
62fe57d
@TejasRGitHub
Copy link
Contributor Author

@dlpzx , Merged from main and resolved conflicts

@dlpzx dlpzx merged commit 851d756 into data-dot-all:main Feb 4, 2025
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SofiaSazonova SofiaSazonova SofiaSazonova approved these changes

@dlpzx dlpzx dlpzx approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TejasRGitHub @dlpzx @SofiaSazonova