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

[SECURITY] Secured Trunk and Glovebox #380

Merged
merged 12 commits into from
Dec 15, 2022

Conversation

r0adra93
Copy link
Contributor

@r0adra93 r0adra93 commented Nov 12, 2022

Converted the the trunk and glovebox items events into functions and exports.

Description

Replaced the glovebox and trunk events with functions and exports. Set it up in qb-jobs.
Needs to be merged along with qb-policejob: qbcore-framework/qb-policejob#422
As the trunk script is insecure and it relies on the security update.

Checklist

  • I have personally loaded this code into an updated qbcore project and checked all of its functionality.
  • My code fits the style guidelines.
  • My PR fits the contribution guidelines.

Converted the the trunk and glovebox items events into functions and exports.
server/main.lua Show resolved Hide resolved
server/main.lua Show resolved Hide resolved
Added the bull ---@ and the deprecation messages for the two events
satisfied linter
@tom-osborne tom-osborne removed their request for review November 12, 2022 18:46
Further secured the inventory system. I didn't search through the entire core to update teh change so I printed to console to let server ops know that the event, even though it works will be deprecated and to use the export instead.
streamlined the function and still secure.
server/main.lua Outdated Show resolved Hide resolved
Added in the luadoc items
Copy link

@Irishstevie Irishstevie left a comment

Choose a reason for hiding this comment

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

I run this with qb-policejob: qbcore-framework/qb-policejob#422

Tested storage Pull out cars open all the menus

Works good

server/main.lua Outdated Show resolved Hide resolved
server/main.lua Outdated Show resolved Hide resolved
charj won't approve this PR unless I made changes elsewhere in the code. So changes have been made.
@r0adra93 r0adra93 requested review from tom-osborne and S33G and removed request for tom-osborne November 23, 2022 20:23
@Z3rio Z3rio requested review from Z3rio and removed request for S33G December 12, 2022 19:21
@Z3rio Z3rio changed the title Secured Trunk and Glovebox [SECURITY] Secured Trunk and Glovebox Dec 14, 2022
@Z3rio Z3rio added the security label Dec 14, 2022
Copy link
Contributor

@Z3rio Z3rio left a comment

Choose a reason for hiding this comment

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

The inventory seems to be working as normal after these changes.

@Z3rio Z3rio merged commit 7561d63 into qbcore-framework:main Dec 15, 2022
@S33G
Copy link
Contributor

S33G commented Feb 22, 2023

This PR being merged has created further issues:
#422

@r0adra93
Copy link
Contributor Author

r0adra93 commented Feb 22, 2023

This PR being merged has created further issues: #422

I don't know if it's the act of this PR being merged or the other merges that happened after it. This worked perfectly, then after I pulled an update after this PR it all broke and I said to hell with this and went back to using the unsecure method in qb-jobs. Since the unsecure method was put back into this resource.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants