Merge pull request #19 from mathstuf/add-cirrus-ci

Add cirrus ci

Author: mathstuf

.cirrus.yml

@@ -0,0 +1,44 @@
+clippy_task:
+    container:
+        image: rustlang/rust:nightly
+    keyutils_script: apt-get update && apt-get install libkeyutils-dev
+    component_script: rustup component add clippy
+    update_script: cargo +nightly update
+    toolchain_cache:
+        folder: $RUSTUP_HOME
+        fingerprint_script: rustc +nightly --version
+    cargo_cache:
+        folder: $CARGO_HOME/registry
+        fingerprint_script: cat Cargo.lock
+    fmt_script: cargo +nightly clippy
+
+rustfmt_task:
+    container:
+        image: rustlang/rust:nightly
+    keyutils_script: apt-get update && apt-get install libkeyutils-dev
+    component_script: rustup component add rustfmt
+    fmt_script: cargo fmt --all -- --check
+
+linux_task:
+    container:
+      image: rust:latest
+    matrix:
+        - env:
+              RUSTVER: 1.32.0
+        - env:
+              RUSTVER: stable
+        - allow_failures: true
+          env:
+              RUSTVER: nightly
+    keyutils_script: apt-get update && apt-get install libkeyutils-dev
+    rustup_script: rustup toolchain install $RUSTVER
+    toolchain_cache:
+        folder: $RUSTUP_HOME
+        fingerprint_script: rustc +$RUSTVER --version
+    update_script: cargo +$RUSTVER update
+    cargo_cache:
+        folder: $CARGO_HOME/registry
+        fingerprint_script: cat Cargo.lock
+    build_script: cargo +$RUSTVER build
+    test_script: cargo +$RUSTVER test
+    before_cache_script: rm -rf $CARGO_HOME/registry/index

rustfmt.toml renamed to .rustfmt.toml

@@ -1,6 +1,6 @@
-match_block_trailing_comma = true
 force_multiline_blocks = true
-report_todo = "Unnumbered"
+license_template_path = ".license.template"
+match_block_trailing_comma = true
 report_fixme = "Unnumbered"
+report_todo = "Unnumbered"
 struct_lit_single_line = false
-license_template_path = ".license.template"

libkeyutils-sys/src/constants.rs

@@ -29,8 +29,8 @@
 
 use types::{key_perm_t, key_serial_t};
 
-pub const KEY_TYPE_USER:                    &'static str = "user";
-pub const KEY_TYPE_LOGON:                   &'static str = "logon";
+pub const KEY_TYPE_USER:                    &str = "user";
+pub const KEY_TYPE_LOGON:                   &str = "logon";
 
 pub const KEY_SPEC_THREAD_KEYRING:          key_serial_t = -1;
 pub const KEY_SPEC_PROCESS_KEYRING:         key_serial_t = -2;
@@ -49,34 +49,34 @@ pub const KEY_REQKEY_DEFL_USER_KEYRING:         key_serial_t = 4;
 pub const KEY_REQKEY_DEFL_USER_SESSION_KEYRING: key_serial_t = 5;
 pub const KEY_REQKEY_DEFL_GROUP_KEYRING:        key_serial_t = 6;
 
-pub const KEY_POS_VIEW:    key_perm_t = 0x01000000;     /* possessor can view a key's attributes */
-pub const KEY_POS_READ:    key_perm_t = 0x02000000;     /* possessor can read key payload / view keyring */
-pub const KEY_POS_WRITE:   key_perm_t = 0x04000000;     /* possessor can update key payload / add link to keyring */
-pub const KEY_POS_SEARCH:  key_perm_t = 0x08000000;     /* possessor can find a key in search / search a keyring */
-pub const KEY_POS_LINK:    key_perm_t = 0x10000000;     /* possessor can create a link to a key/keyring */
-pub const KEY_POS_SETATTR: key_perm_t = 0x20000000;     /* possessor can set key attributes */
-pub const KEY_POS_ALL:     key_perm_t = 0x3f000000;
+pub const KEY_POS_VIEW:    key_perm_t = 0x0100_0000;     /* possessor can view a key's attributes */
+pub const KEY_POS_READ:    key_perm_t = 0x0200_0000;     /* possessor can read key payload / view keyring */
+pub const KEY_POS_WRITE:   key_perm_t = 0x0400_0000;     /* possessor can update key payload / add link to keyring */
+pub const KEY_POS_SEARCH:  key_perm_t = 0x0800_0000;     /* possessor can find a key in search / search a keyring */
+pub const KEY_POS_LINK:    key_perm_t = 0x1000_0000;     /* possessor can create a link to a key/keyring */
+pub const KEY_POS_SETATTR: key_perm_t = 0x2000_0000;     /* possessor can set key attributes */
+pub const KEY_POS_ALL:     key_perm_t = 0x3f00_0000;
 
-pub const KEY_USR_VIEW:    key_perm_t = 0x00010000;     /* user permissions... */
-pub const KEY_USR_READ:    key_perm_t = 0x00020000;
-pub const KEY_USR_WRITE:   key_perm_t = 0x00040000;
-pub const KEY_USR_SEARCH:  key_perm_t = 0x00080000;
-pub const KEY_USR_LINK:    key_perm_t = 0x00100000;
-pub const KEY_USR_SETATTR: key_perm_t = 0x00200000;
-pub const KEY_USR_ALL:     key_perm_t = 0x003f0000;
+pub const KEY_USR_VIEW:    key_perm_t = 0x0001_0000;     /* user permissions... */
+pub const KEY_USR_READ:    key_perm_t = 0x0002_0000;
+pub const KEY_USR_WRITE:   key_perm_t = 0x0004_0000;
+pub const KEY_USR_SEARCH:  key_perm_t = 0x0008_0000;
+pub const KEY_USR_LINK:    key_perm_t = 0x0010_0000;
+pub const KEY_USR_SETATTR: key_perm_t = 0x0020_0000;
+pub const KEY_USR_ALL:     key_perm_t = 0x003f_0000;
 
-pub const KEY_GRP_VIEW:    key_perm_t = 0x00000100;     /* group permissions... */
-pub const KEY_GRP_READ:    key_perm_t = 0x00000200;
-pub const KEY_GRP_WRITE:   key_perm_t = 0x00000400;
-pub const KEY_GRP_SEARCH:  key_perm_t = 0x00000800;
-pub const KEY_GRP_LINK:    key_perm_t = 0x00001000;
-pub const KEY_GRP_SETATTR: key_perm_t = 0x00002000;
-pub const KEY_GRP_ALL:     key_perm_t = 0x00003f00;
+pub const KEY_GRP_VIEW:    key_perm_t = 0x0000_0100;     /* group permissions... */
+pub const KEY_GRP_READ:    key_perm_t = 0x0000_0200;
+pub const KEY_GRP_WRITE:   key_perm_t = 0x0000_0400;
+pub const KEY_GRP_SEARCH:  key_perm_t = 0x0000_0800;
+pub const KEY_GRP_LINK:    key_perm_t = 0x0000_1000;
+pub const KEY_GRP_SETATTR: key_perm_t = 0x0000_2000;
+pub const KEY_GRP_ALL:     key_perm_t = 0x0000_3f00;
 
-pub const KEY_OTH_VIEW:    key_perm_t = 0x00000001;     /* third party permissions... */
-pub const KEY_OTH_READ:    key_perm_t = 0x00000002;
-pub const KEY_OTH_WRITE:   key_perm_t = 0x00000004;
-pub const KEY_OTH_SEARCH:  key_perm_t = 0x00000008;
-pub const KEY_OTH_LINK:    key_perm_t = 0x00000010;
-pub const KEY_OTH_SETATTR: key_perm_t = 0x00000020;
-pub const KEY_OTH_ALL:     key_perm_t = 0x0000003f;
+pub const KEY_OTH_VIEW:    key_perm_t = 0x0000_0001;     /* third party permissions... */
+pub const KEY_OTH_READ:    key_perm_t = 0x0000_0002;
+pub const KEY_OTH_WRITE:   key_perm_t = 0x0000_0004;
+pub const KEY_OTH_SEARCH:  key_perm_t = 0x0000_0008;
+pub const KEY_OTH_LINK:    key_perm_t = 0x0000_0010;
+pub const KEY_OTH_SETATTR: key_perm_t = 0x0000_0020;
+pub const KEY_OTH_ALL:     key_perm_t = 0x0000_003f;

libkeyutils-sys/src/functions.rs

@@ -28,7 +28,7 @@ use crates::libc;
 
 use types::{key_perm_t, key_serial_t};
 
-#[cfg_attr(rustfmt, rustfmt_skip)]
+#[rustfmt::skip]
 extern "C" {
     pub fn add_key(
         type_:          *const libc::c_char,

src/api.rs

@@ -24,14 +24,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-use crates::errno;
-use crates::libc;
-use crates::libkeyutils_sys::*;
-
-use constants::{DefaultKeyring, KeyringSerial, KeyPermissions, Permission, SpecialKeyring};
-use keytype::*;
-use keytypes;
-
 use std::borrow::Borrow;
 use std::ffi::CString;
 use std::mem;
@@ -40,6 +32,14 @@ use std::result;
 use std::str;
 use std::time::Duration;
 
+use crates::errno;
+use crates::libc;
+use crates::libkeyutils_sys::*;
+
+use constants::{DefaultKeyring, KeyPermissions, KeyringSerial, Permission, SpecialKeyring};
+use keytype::*;
+use keytypes;
+
 /// Reexport of `Errno` as `Error`.
 pub type Error = errno::Errno;
 /// Simpler `Result` type with the error already set.
@@ -81,13 +81,13 @@ impl Keyring {
     /// This is unsafe because no keyring is known to exist with the given ID.
     pub unsafe fn new(id: KeyringSerial) -> Self {
         Keyring {
-            id: id,
+            id,
         }
     }
 
     fn new_impl(id: KeyringSerial) -> Self {
         Keyring {
-            id: id,
+            id,
         }
     }
 
@@ -512,7 +512,7 @@ impl Key {
 
     fn new_impl(id: KeyringSerial) -> Self {
         Key {
-            id: id,
+            id,
         }
     }
 
@@ -730,7 +730,7 @@ pub struct KeyManager {
 impl KeyManager {
     fn new(key: Key) -> Self {
         KeyManager {
-            key: key,
+            key,
         }
     }
 
@@ -805,11 +805,11 @@ impl KeyManager {
 
 #[cfg(test)]
 mod tests {
-    use crates::libc;
-
     use std::thread;
     use std::time::Duration;
 
+    use crates::libc;
+
     use api::Keyring;
     use constants::{Permission, SpecialKeyring};
     use keytype::KeyType;

src/keytype.rs

@@ -0,0 +1,92 @@
+// Copyright (c) 2015, Ben Boeckel
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright notice,
+//       this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above copyright notice,
+//       this list of conditions and the following disclaimer in the documentation
+//       and/or other materials provided with the distribution.
+//     * Neither the name of this project nor the names of its contributors
+//       may be used to endorse or promote products derived from this software
+//       without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+use std::borrow::Cow;
+
+/// A trait for representing a type of key in the Linux keyring subsystem.
+pub trait KeyType {
+    /// The type for describing the key.
+    type Description: KeyDescription + ?Sized;
+    /// The type for representing a payload for the key.
+    type Payload: KeyPayload + ?Sized;
+
+    /// The name of the keytype.
+    fn name() -> &'static str;
+}
+
+/// A description for a key.
+pub trait KeyDescription {
+    /// The description of the key.
+    fn description(&self) -> Cow<str>;
+}
+
+impl KeyDescription for str {
+    fn description(&self) -> Cow<str> {
+        Cow::Borrowed(&self)
+    }
+}
+
+impl KeyDescription for String {
+    fn description(&self) -> Cow<str> {
+        Cow::Borrowed(&self)
+    }
+}
+
+/// A payload for a key.
+pub trait KeyPayload {
+    /// The payload for the key.
+    fn payload(&self) -> Cow<[u8]>;
+}
+
+impl KeyPayload for () {
+    fn payload(&self) -> Cow<[u8]> {
+        Cow::Borrowed(&[])
+    }
+}
+
+impl KeyPayload for str {
+    fn payload(&self) -> Cow<[u8]> {
+        Cow::Borrowed(self.as_bytes())
+    }
+}
+
+impl KeyPayload for String {
+    fn payload(&self) -> Cow<[u8]> {
+        Cow::Borrowed(self.as_bytes())
+    }
+}
+
+impl KeyPayload for [u8] {
+    fn payload(&self) -> Cow<[u8]> {
+        Cow::Borrowed(self)
+    }
+}
+
+impl KeyPayload for Vec<u8> {
+    fn payload(&self) -> Cow<[u8]> {
+        Cow::Borrowed(&self)
+    }
+}

src/keytypes/blacklist.rs

@@ -26,11 +26,11 @@
 
 //! Certificate blacklist keys
 
+use std::borrow::Cow;
+
 use keytype::*;
 use keytypes::AsciiHex;
 
-use std::borrow::Cow;
-
 /// Blacklist hashes.
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
 pub struct Blacklist;

src/keytypes/dns_resolver.rs

@@ -26,10 +26,10 @@
 
 //! DNS resolution keys
 
-use keytype::*;
-
 use std::borrow::Cow;
 
+use keytype::*;
+
 /// A DNS resolver key.
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
 pub struct DnsResolver;

src/keytypes/encrypted.rs

@@ -26,11 +26,11 @@
 
 //! Encrypted keys
 
+use std::borrow::Cow;
+
 use keytype::*;
 use keytypes::AsciiHex;
 
-use std::borrow::Cow;
-
 /// Encrypted keys.
 ///
 /// Encrypted keys are very similar to `Trusted` keys, however they do not require a TPM to

src/keytypes/logon.rs

@@ -28,12 +28,12 @@
 //!
 //! Logon keys are arbitrary keys that userspace cannot read once set.
 
+use std::borrow::Cow;
+
 use crates::libkeyutils_sys::KEY_TYPE_LOGON;
 
 use keytype::*;
 
-use std::borrow::Cow;
-
 /// Keys which can only be created and updated from userspace but not read back.
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
 pub struct Logon;