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

Add some missing flags and expose service handle #115

Merged
merged 5 commits into from
Jan 18, 2024
Merged

Conversation

NuSkooler
Copy link
Contributor

@NuSkooler NuSkooler commented Jan 16, 2024

This adds some of the ALL_ACCESS flags + exposes the raw service handle. I'm personally using this for SetServiceObjectSecurity.

One could expose a more Rust-like set_service_object_security() call, though it could become fairly complex. I'm hesitant to try to do that right away before the library is based off of the official Windows crates.

Thoughts?


This change is Reviewable

Copy link
Member

@faern faern left a comment

Choose a reason for hiding this comment

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

Thank you for this addition! See my individual comments for some small improvement suggestions.

Cargo.toml Outdated Show resolved Hide resolved
src/service.rs Outdated
@@ -1843,6 +1847,10 @@ impl Service {
}
}

pub fn raw_service_handle(&self) -> Security::SC_HANDLE {
Copy link
Member

Choose a reason for hiding this comment

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

We have a lot of to-raw exposure in this crate already, and we usually name the methods to_raw unless I have missed some places where we are inconsistent(?). Can you please follow the same naming convention?

I also think this type of method should either be close to the top or bottom of methods, not somewhere in the middle. Please look at similar examples and try to be consistent with those (if we have a pattern? But I think we do).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I found a number of to_raw, but in this case, I changed it to mirror the underlying raw_handle. If you'd like to_raw, I can of course make that change!

Copy link
Contributor

Choose a reason for hiding this comment

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

Private wrapper type ScHandle exposes raw_handle but a lot of places use to_raw. 🤷‍♂️

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Would you like to switch it to_raw? I'm happy to do so if that's your preference!

Copy link
Contributor

Choose a reason for hiding this comment

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

Personally I'd use to_raw to keep the interface homogeneous and familiar to consumers.

Copy link
Member

Choose a reason for hiding this comment

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

One could argue we should stop we the bespoke methods and just implement https://doc.rust-lang.org/stable/std/os/windows/io/trait.IntoRawHandle.html for the relevant types instead. But that's not going to happen in this PR. For now I think we should just be consistent with what this library usually uses (to_raw)

src/service_manager.rs Show resolved Hide resolved
@NuSkooler
Copy link
Contributor Author

Thank you for this addition! See my individual comments for some small improvement suggestions.

Thanks for the quick response! Made some quick updates, happy to adjust whatever else is needed!

src/service_manager.rs Show resolved Hide resolved
@faern faern merged commit 8233eb9 into mullvad:main Jan 18, 2024
10 checks passed
faern pushed a commit that referenced this pull request Jan 18, 2024
* Expose raw service handle

* Additional service and SC manager flags
@faern
Copy link
Member

faern commented Jan 18, 2024

@NuSkooler Thank you for the contribution!

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.

3 participants