From 59a0e72033d4ea85dee9ca3a45464f2f5542bcbf Mon Sep 17 00:00:00 2001 From: Richard Zak Date: Sat, 8 Feb 2025 12:18:38 -0500 Subject: [PATCH] chore: add and require spdx headers Signed-off-by: Richard Zak --- .github/workflows/lint.yml | 8 ++++++++ build.rs | 2 ++ client/build.rs | 2 ++ client/src/cli/cart.rs | 2 ++ client/src/cli/mod.rs | 2 ++ client/src/cli/report.rs | 2 ++ client/src/cli/retrieval.rs | 2 ++ client/src/cli/similar.rs | 2 ++ client/src/cli/submit.rs | 2 ++ client/src/lib.rs | 2 ++ client/src/main.rs | 2 ++ client/src/option_cert_path_serialization.rs | 2 ++ crates/api/src/digest.rs | 2 ++ crates/api/src/lib.rs | 2 ++ crates/server/build.rs | 2 ++ crates/server/src/crypto.rs | 2 ++ crates/server/src/db/admin.rs | 2 ++ crates/server/src/db/malwaredb_pg.sql | 2 ++ crates/server/src/db/malwaredb_sqlite.sql | 2 ++ crates/server/src/db/mod.rs | 3 ++- crates/server/src/db/pg.rs | 2 ++ crates/server/src/db/sqlite.rs | 2 ++ crates/server/src/db/types.rs | 2 ++ crates/server/src/http/mod.rs | 2 ++ crates/server/src/http/receive.rs | 2 ++ crates/server/src/lib.rs | 2 ++ crates/server/src/utils/mod.rs | 2 ++ crates/server/src/vt/mod.rs | 2 ++ crates/types/src/doc/mod.rs | 2 ++ crates/types/src/doc/office95.rs | 2 ++ crates/types/src/doc/pdf.rs | 2 ++ crates/types/src/doc/rtf.rs | 2 ++ crates/types/src/exec/elf/fields.rs | 2 ++ crates/types/src/exec/elf/mod.rs | 2 ++ crates/types/src/exec/macho/fat.rs | 2 ++ crates/types/src/exec/macho/mod.rs | 2 ++ crates/types/src/exec/mod.rs | 2 ++ crates/types/src/exec/pe32/fields.rs | 2 ++ crates/types/src/exec/pe32/mod.rs | 2 ++ crates/types/src/exec/pe32/utils.rs | 2 ++ crates/types/src/exec/pef/mod.rs | 2 ++ crates/types/src/lib.rs | 2 ++ crates/types/src/main.rs | 2 ++ crates/types/src/utils.rs | 2 ++ crates/types/testdata/Hello.java | 2 ++ crates/types/testdata/source.c | 2 ++ crates/types/testdata/source.cs | 2 ++ crates/types/testdata/source_lib.c | 2 ++ src/cli/admin/compression.rs | 2 ++ src/cli/admin/config.rs | 2 ++ src/cli/admin/groups.rs | 2 ++ src/cli/admin/keys.rs | 2 ++ src/cli/admin/labels.rs | 2 ++ src/cli/admin/load.rs | 2 ++ src/cli/admin/mod.rs | 2 ++ src/cli/admin/sources.rs | 2 ++ src/cli/admin/users.rs | 2 ++ src/cli/admin/vt.rs | 2 ++ src/cli/cart_io.rs | 2 ++ src/cli/config.rs | 2 ++ src/cli/mod.rs | 2 ++ src/cli/run.rs | 2 ++ src/cli/service/freebsd.rs | 2 ++ src/cli/service/launchctl.rs | 2 ++ src/cli/service/mod.rs | 2 ++ src/cli/service/other.rs | 2 ++ src/cli/service/systemd.rs | 2 ++ src/cli/vt/data_loader.rs | 2 ++ src/cli/vt/mod.rs | 2 ++ src/cli/vt/updater.rs | 2 ++ src/gui/admin.slint | 2 ++ src/gui/mod.rs | 2 ++ src/main.rs | 2 ++ testdata/make_certs.sh | 1 + 74 files changed, 153 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e2a66390..50e202dd 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -32,6 +32,14 @@ jobs: - name: cargo clippy run: cargo clippy --workspace --all-features --tests -- -D warnings + check-spdx-headers: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: enarx/spdx@b5bfdd4410071bf058c8333d0e70020001524b6b # master + with: + licenses: Apache-2.0 + udeps: name: Unused dependencies runs-on: ubuntu-latest diff --git a/build.rs b/build.rs index 53e4b043..a5928538 100644 --- a/build.rs +++ b/build.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use vergen_gitcl::{BuildBuilder, Emitter, GitclBuilder}; fn main() { diff --git a/client/build.rs b/client/build.rs index 63b7d5ff..0e0a8eed 100644 --- a/client/build.rs +++ b/client/build.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use vergen_gitcl::{BuildBuilder, Emitter, GitclBuilder}; fn main() { diff --git a/client/src/cli/cart.rs b/client/src/cli/cart.rs index a0a4d779..3c3fb4b9 100644 --- a/client/src/cli/cart.rs +++ b/client/src/cli/cart.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use std::fs::File; use std::io::Cursor; use std::path::PathBuf; diff --git a/client/src/cli/mod.rs b/client/src/cli/mod.rs index 9fde6632..3e85c0a5 100644 --- a/client/src/cli/mod.rs +++ b/client/src/cli/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use crate::MdbClient; use std::path::PathBuf; pub mod cart; diff --git a/client/src/cli/report.rs b/client/src/cli/report.rs index 5a910f71..1c50dd46 100644 --- a/client/src/cli/report.rs +++ b/client/src/cli/report.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use crate::MdbClient; use std::path::PathBuf; diff --git a/client/src/cli/retrieval.rs b/client/src/cli/retrieval.rs index 6dc74495..1cbacb7a 100644 --- a/client/src/cli/retrieval.rs +++ b/client/src/cli/retrieval.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use crate::MdbClient; use std::process::ExitCode; diff --git a/client/src/cli/similar.rs b/client/src/cli/similar.rs index 6b27a28e..2eee5347 100644 --- a/client/src/cli/similar.rs +++ b/client/src/cli/similar.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use crate::MdbClient; use std::path::PathBuf; diff --git a/client/src/cli/submit.rs b/client/src/cli/submit.rs index f4242fba..09de2187 100644 --- a/client/src/cli/submit.rs +++ b/client/src/cli/submit.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use crate::MdbClient; use malwaredb_types::doc::{is_zip_file_doc, PK_HEADER}; diff --git a/client/src/lib.rs b/client/src/lib.rs index 0f183330..0a8abd4e 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + #![doc = include_str!("../README.md")] #![deny(missing_docs)] diff --git a/client/src/main.rs b/client/src/main.rs index 70f86c7a..6563dae6 100644 --- a/client/src/main.rs +++ b/client/src/main.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + mod cli; use malwaredb_client::MdbClient; diff --git a/client/src/option_cert_path_serialization.rs b/client/src/option_cert_path_serialization.rs index cb573cee..4e37cdd0 100644 --- a/client/src/option_cert_path_serialization.rs +++ b/client/src/option_cert_path_serialization.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use std::path::PathBuf; use reqwest::Certificate; diff --git a/crates/api/src/digest.rs b/crates/api/src/digest.rs index 7c7adbb2..b91b546d 100644 --- a/crates/api/src/digest.rs +++ b/crates/api/src/digest.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use std::borrow::Borrow; use std::error::Error; use std::fmt::{Display, Formatter}; diff --git a/crates/api/src/lib.rs b/crates/api/src/lib.rs index 1e2091e2..08ca89a5 100644 --- a/crates/api/src/lib.rs +++ b/crates/api/src/lib.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + #![doc = include_str!("../README.md")] #![deny(missing_docs)] diff --git a/crates/server/build.rs b/crates/server/build.rs index 04bdd506..af08e663 100644 --- a/crates/server/build.rs +++ b/crates/server/build.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + fn main() { #[cfg(target_os = "windows")] vcpkg::find_package("libmagic").unwrap(); diff --git a/crates/server/src/crypto.rs b/crates/server/src/crypto.rs index 1b6887f4..757ffe88 100644 --- a/crates/server/src/crypto.rs +++ b/crates/server/src/crypto.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use std::fmt::{Display, Formatter}; use std::io::{Cursor, Write}; diff --git a/crates/server/src/db/admin.rs b/crates/server/src/db/admin.rs index 20e8a824..d3272dd8 100644 --- a/crates/server/src/db/admin.rs +++ b/crates/server/src/db/admin.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use std::fmt::{Display, Formatter}; #[derive(Clone, Debug)] diff --git a/crates/server/src/db/malwaredb_pg.sql b/crates/server/src/db/malwaredb_pg.sql index 9b5db5f9..3df48b1c 100644 --- a/crates/server/src/db/malwaredb_pg.sql +++ b/crates/server/src/db/malwaredb_pg.sql @@ -1,3 +1,5 @@ +-- SPDX-License-Identifier: Apache-2.0 + CREATE TYPE encryptionkey_algorithm AS ENUM('rc4', 'xor', 'aes128'); CREATE TABLE encryptionkey ( diff --git a/crates/server/src/db/malwaredb_sqlite.sql b/crates/server/src/db/malwaredb_sqlite.sql index 1217cad9..2224c63e 100644 --- a/crates/server/src/db/malwaredb_sqlite.sql +++ b/crates/server/src/db/malwaredb_sqlite.sql @@ -1,3 +1,5 @@ +-- SPDX-License-Identifier: Apache-2.0 + PRAGMA foreign_keys = ON; CREATE TABLE encryptionkey ( diff --git a/crates/server/src/db/mod.rs b/crates/server/src/db/mod.rs index e63324e8..afd90bf3 100644 --- a/crates/server/src/db/mod.rs +++ b/crates/server/src/db/mod.rs @@ -1,4 +1,5 @@ -//! +// SPDX-License-Identifier: Apache-2.0 + //! Postgres is the database used by MalwareDB. //! However, SQLite will be used for unit testing. This option can be allowed by using the `sqlite` //! feature flag. When using SQLite, any similarity functions must be calculated by MalwareDB. diff --git a/crates/server/src/db/pg.rs b/crates/server/src/db/pg.rs index 37af0513..82b0ebe7 100644 --- a/crates/server/src/db/pg.rs +++ b/crates/server/src/db/pg.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + #[cfg(any(test, feature = "admin"))] use super::{admin, hash_password}; use super::{random_bytes_api_key, DatabaseInformation, MDBConfig}; diff --git a/crates/server/src/db/sqlite.rs b/crates/server/src/db/sqlite.rs index 75710147..0f2aae76 100644 --- a/crates/server/src/db/sqlite.rs +++ b/crates/server/src/db/sqlite.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + #[cfg(any(test, feature = "admin"))] use super::admin; #[cfg(any(test, feature = "admin"))] diff --git a/crates/server/src/db/types.rs b/crates/server/src/db/types.rs index 848ee6cf..7e988fa3 100644 --- a/crates/server/src/db/types.rs +++ b/crates/server/src/db/types.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use malwaredb_api::{SupportedFileType, SupportedFileTypes}; use malwaredb_types::utils::EntropyCalc; diff --git a/crates/server/src/http/mod.rs b/crates/server/src/http/mod.rs index 856cd219..734a16f1 100644 --- a/crates/server/src/http/mod.rs +++ b/crates/server/src/http/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use super::State; use crate::db::types::FileTypes; use malwaredb_api::digest::HashType; diff --git a/crates/server/src/http/receive.rs b/crates/server/src/http/receive.rs index 07f8bb31..21122579 100644 --- a/crates/server/src/http/receive.rs +++ b/crates/server/src/http/receive.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use crate::db::types::FileMetadata; use crate::State; use malwaredb_types::KnownType; diff --git a/crates/server/src/lib.rs b/crates/server/src/lib.rs index c9168965..63e1bdc2 100644 --- a/crates/server/src/lib.rs +++ b/crates/server/src/lib.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + #![doc = include_str!("../README.md")] #![deny(missing_docs)] diff --git a/crates/server/src/utils/mod.rs b/crates/server/src/utils/mod.rs index ff267d60..e6620a64 100644 --- a/crates/server/src/utils/mod.rs +++ b/crates/server/src/utils/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use std::fmt::LowerHex; use std::path::PathBuf; diff --git a/crates/server/src/vt/mod.rs b/crates/server/src/vt/mod.rs index b85da5a7..10641716 100644 --- a/crates/server/src/vt/mod.rs +++ b/crates/server/src/vt/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use crate::State; use std::fmt::{Display, Formatter}; diff --git a/crates/types/src/doc/mod.rs b/crates/types/src/doc/mod.rs index c4cf89e0..61e95f6a 100644 --- a/crates/types/src/doc/mod.rs +++ b/crates/types/src/doc/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use chrono::{DateTime, Utc}; #[cfg(feature = "officexml")] use std::fs::File; diff --git a/crates/types/src/doc/office95.rs b/crates/types/src/doc/office95.rs index 81e1cc88..bf82885a 100644 --- a/crates/types/src/doc/office95.rs +++ b/crates/types/src/doc/office95.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use crate::doc::DocumentFile; use crate::utils::u64_from_offset; use crate::{Ordering, SpecimenFile}; diff --git a/crates/types/src/doc/pdf.rs b/crates/types/src/doc/pdf.rs index f9039b41..38152791 100644 --- a/crates/types/src/doc/pdf.rs +++ b/crates/types/src/doc/pdf.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use crate::SpecimenFile; use std::fmt::{Display, Formatter}; diff --git a/crates/types/src/doc/rtf.rs b/crates/types/src/doc/rtf.rs index 6f50aa3d..651437d5 100644 --- a/crates/types/src/doc/rtf.rs +++ b/crates/types/src/doc/rtf.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use crate::utils::find_subsequence; use crate::SpecimenFile; diff --git a/crates/types/src/exec/elf/fields.rs b/crates/types/src/exec/elf/fields.rs index 6920c47d..56994978 100644 --- a/crates/types/src/exec/elf/fields.rs +++ b/crates/types/src/exec/elf/fields.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use flagset::flags; flags! { diff --git a/crates/types/src/exec/elf/mod.rs b/crates/types/src/exec/elf/mod.rs index 783debe6..d9862e85 100644 --- a/crates/types/src/exec/elf/mod.rs +++ b/crates/types/src/exec/elf/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + /// Flags for some fields within an ELF header pub mod fields; diff --git a/crates/types/src/exec/macho/fat.rs b/crates/types/src/exec/macho/fat.rs index de507468..f4adab87 100644 --- a/crates/types/src/exec/macho/fat.rs +++ b/crates/types/src/exec/macho/fat.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use crate::exec::{macho::Macho, Architecture, ExecutableFile, OperatingSystem, Sections}; use crate::utils::{bytes_offset_match, u32_from_offset, EntropyCalc}; use crate::{Ordering, SpecimenFile}; diff --git a/crates/types/src/exec/macho/mod.rs b/crates/types/src/exec/macho/mod.rs index 21e4e5bb..a2e36c57 100644 --- a/crates/types/src/exec/macho/mod.rs +++ b/crates/types/src/exec/macho/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + /// Fat Mach-O parsing (multiple Mach-O programs in one binary) pub mod fat; diff --git a/crates/types/src/exec/mod.rs b/crates/types/src/exec/mod.rs index 77f7eb3e..57f6146b 100644 --- a/crates/types/src/exec/mod.rs +++ b/crates/types/src/exec/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use std::collections::{HashMap, HashSet}; use std::fmt::{Display, Formatter}; diff --git a/crates/types/src/exec/pe32/fields.rs b/crates/types/src/exec/pe32/fields.rs index 2f0476d1..ba3f2a6a 100644 --- a/crates/types/src/exec/pe32/fields.rs +++ b/crates/types/src/exec/pe32/fields.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use super::utils::u32_or_none_from_offset; use crate::exec::pe32::utils::{u16_or_none_from_offset, u64_or_none_from_offset}; use crate::exec::{Architecture, Import, Imports, Section}; diff --git a/crates/types/src/exec/pe32/mod.rs b/crates/types/src/exec/pe32/mod.rs index c9ece88f..d830ef2a 100644 --- a/crates/types/src/exec/pe32/mod.rs +++ b/crates/types/src/exec/pe32/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + /// PE-32 fields mod fields; diff --git a/crates/types/src/exec/pe32/utils.rs b/crates/types/src/exec/pe32/utils.rs index 41044da0..151f3f13 100644 --- a/crates/types/src/exec/pe32/utils.rs +++ b/crates/types/src/exec/pe32/utils.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use crate::utils::{u16_from_offset, u32_from_offset, u64_from_offset}; use crate::Ordering; diff --git a/crates/types/src/exec/pef/mod.rs b/crates/types/src/exec/pef/mod.rs index 037512df..744bd59e 100644 --- a/crates/types/src/exec/pef/mod.rs +++ b/crates/types/src/exec/pef/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use crate::exec::{Architecture, ExecutableFile, OperatingSystem, Section, Sections}; use crate::utils::{ bytes_offset_match, i32_from_offset, string_from_offset, u16_from_offset, u32_from_offset, diff --git a/crates/types/src/lib.rs b/crates/types/src/lib.rs index 368c43f5..792ba9e3 100644 --- a/crates/types/src/lib.rs +++ b/crates/types/src/lib.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + #![doc = include_str!("../README.md")] #![deny(missing_docs)] diff --git a/crates/types/src/main.rs b/crates/types/src/main.rs index 568473f3..f47a99a6 100644 --- a/crates/types/src/main.rs +++ b/crates/types/src/main.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + #[cfg(any(feature = "office95", feature = "pdf", feature = "rtf"))] use malwaredb_types::doc; #[cfg(any(feature = "elf", feature = "macho", feature = "pe32", feature = "pef"))] diff --git a/crates/types/src/utils.rs b/crates/types/src/utils.rs index ac60ab86..55c3258d 100644 --- a/crates/types/src/utils.rs +++ b/crates/types/src/utils.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + // Convenience functions for reading data types from binary blobs use crate::Ordering; diff --git a/crates/types/testdata/Hello.java b/crates/types/testdata/Hello.java index 8f670254..40e88242 100644 --- a/crates/types/testdata/Hello.java +++ b/crates/types/testdata/Hello.java @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + package none; public class Hello { diff --git a/crates/types/testdata/source.c b/crates/types/testdata/source.c index c412ece2..237cbac7 100644 --- a/crates/types/testdata/source.c +++ b/crates/types/testdata/source.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + #include int main() { diff --git a/crates/types/testdata/source.cs b/crates/types/testdata/source.cs index f92e8726..4c5dc202 100644 --- a/crates/types/testdata/source.cs +++ b/crates/types/testdata/source.cs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + using System; public class HelloWorld { diff --git a/crates/types/testdata/source_lib.c b/crates/types/testdata/source_lib.c index 0bfc8d55..b019a6a9 100644 --- a/crates/types/testdata/source_lib.c +++ b/crates/types/testdata/source_lib.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + #include void hello() { diff --git a/src/cli/admin/compression.rs b/src/cli/admin/compression.rs index b22554ea..183daf64 100644 --- a/src/cli/admin/compression.rs +++ b/src/cli/admin/compression.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use malwaredb_server::State; use std::process::ExitCode; diff --git a/src/cli/admin/config.rs b/src/cli/admin/config.rs index 06271b5b..287c03db 100644 --- a/src/cli/admin/config.rs +++ b/src/cli/admin/config.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use crate::cli::config::{Config, CONFIG_PATHS}; use std::fs; diff --git a/src/cli/admin/groups.rs b/src/cli/admin/groups.rs index e1f33442..438a950f 100644 --- a/src/cli/admin/groups.rs +++ b/src/cli/admin/groups.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use malwaredb_server::State; use std::process::ExitCode; diff --git a/src/cli/admin/keys.rs b/src/cli/admin/keys.rs index 7ff53e05..de13396f 100644 --- a/src/cli/admin/keys.rs +++ b/src/cli/admin/keys.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use malwaredb_server::{ crypto::{EncryptionOption, FileEncryption}, State, diff --git a/src/cli/admin/labels.rs b/src/cli/admin/labels.rs index 33cc2866..2d170a42 100644 --- a/src/cli/admin/labels.rs +++ b/src/cli/admin/labels.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use malwaredb_api::{Label, Labels}; use malwaredb_server::State; diff --git a/src/cli/admin/load.rs b/src/cli/admin/load.rs index 6b76c513..d08c7e00 100644 --- a/src/cli/admin/load.rs +++ b/src/cli/admin/load.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use malwaredb_server::db::types::{FileMetadata, FileType}; use malwaredb_server::{State, GZIP_MAGIC}; use malwaredb_types::doc::{is_zip_file_doc, PK_HEADER}; diff --git a/src/cli/admin/mod.rs b/src/cli/admin/mod.rs index f2f884db..291a68f5 100644 --- a/src/cli/admin/mod.rs +++ b/src/cli/admin/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + mod compression; mod config; mod groups; diff --git a/src/cli/admin/sources.rs b/src/cli/admin/sources.rs index 36e36dee..ad8061c1 100644 --- a/src/cli/admin/sources.rs +++ b/src/cli/admin/sources.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use malwaredb_server::State; use std::process::ExitCode; diff --git a/src/cli/admin/users.rs b/src/cli/admin/users.rs index 9b5acbb0..59322af0 100644 --- a/src/cli/admin/users.rs +++ b/src/cli/admin/users.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use malwaredb_server::State; use std::process::ExitCode; diff --git a/src/cli/admin/vt.rs b/src/cli/admin/vt.rs index 10eeac52..a7e4bbea 100644 --- a/src/cli/admin/vt.rs +++ b/src/cli/admin/vt.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use malwaredb_server::State; use std::process::ExitCode; diff --git a/src/cli/cart_io.rs b/src/cli/cart_io.rs index d2d3e498..6209f3bc 100644 --- a/src/cli/cart_io.rs +++ b/src/cli/cart_io.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use malwaredb_server::db::types::FileMetadata; use std::fs::File; diff --git a/src/cli/config.rs b/src/cli/config.rs index 30b52994..33dfa5b6 100644 --- a/src/cli/config.rs +++ b/src/cli/config.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + #[cfg(any(feature = "admin", feature = "admin-gui", feature = "vt"))] use malwaredb_server::State; diff --git a/src/cli/mod.rs b/src/cli/mod.rs index 6fbc8e7e..3adaef14 100644 --- a/src/cli/mod.rs +++ b/src/cli/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + //! How to generate shell completions. //! Instructions based on [Clap](https://github.com/clap-rs/clap/blob/master/clap_complete/examples/completion-derive.rs). //! diff --git a/src/cli/run.rs b/src/cli/run.rs index 1c9cb2c5..aa05a03c 100644 --- a/src/cli/run.rs +++ b/src/cli/run.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use super::config::Config; use malwaredb_server::State; diff --git a/src/cli/service/freebsd.rs b/src/cli/service/freebsd.rs index a94cbbb3..63ef7c5a 100644 --- a/src/cli/service/freebsd.rs +++ b/src/cli/service/freebsd.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use super::Installer; use std::path::PathBuf; diff --git a/src/cli/service/launchctl.rs b/src/cli/service/launchctl.rs index f5d0f12b..794fb64e 100644 --- a/src/cli/service/launchctl.rs +++ b/src/cli/service/launchctl.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use super::Installer; use std::path::PathBuf; diff --git a/src/cli/service/mod.rs b/src/cli/service/mod.rs index f3c893e8..7fddf931 100644 --- a/src/cli/service/mod.rs +++ b/src/cli/service/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use std::process::ExitCode; #[cfg(target_os = "freebsd")] diff --git a/src/cli/service/other.rs b/src/cli/service/other.rs index 0c8ea5af..721b6ae1 100644 --- a/src/cli/service/other.rs +++ b/src/cli/service/other.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use std::process::ExitCode; use clap::Parser; diff --git a/src/cli/service/systemd.rs b/src/cli/service/systemd.rs index 7fa919be..3e91bc02 100644 --- a/src/cli/service/systemd.rs +++ b/src/cli/service/systemd.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use super::Installer; use std::path::PathBuf; diff --git a/src/cli/vt/data_loader.rs b/src/cli/vt/data_loader.rs index b845e482..25ff451c 100644 --- a/src/cli/vt/data_loader.rs +++ b/src/cli/vt/data_loader.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use crate::cli::config::Config; use malwaredb_server::vt::VtUpdater; diff --git a/src/cli/vt/mod.rs b/src/cli/vt/mod.rs index 5ae79315..bb4d2160 100644 --- a/src/cli/vt/mod.rs +++ b/src/cli/vt/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + mod data_loader; mod updater; use crate::cli::config::Config; diff --git a/src/cli/vt/updater.rs b/src/cli/vt/updater.rs index 7105a32e..975402a8 100644 --- a/src/cli/vt/updater.rs +++ b/src/cli/vt/updater.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + use super::super::config::Config; use malwaredb_server::vt::VtUpdater; diff --git a/src/gui/admin.slint b/src/gui/admin.slint index 461c31b0..bb61338e 100644 --- a/src/gui/admin.slint +++ b/src/gui/admin.slint @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + import { AboutSlint, Button, ComboBox, GroupBox, LineEdit, ListView, StandardListView, TabWidget } from "std-widgets.slint"; export struct GuiUser { diff --git a/src/gui/mod.rs b/src/gui/mod.rs index 077f8374..fe783cd4 100644 --- a/src/gui/mod.rs +++ b/src/gui/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + #![allow(unused_imports)] // Slint generates code which imports (and doesn't use) `r#TextStyle`, making Clippy angry. use crate::cli::config::Config; diff --git a/src/main.rs b/src/main.rs index 6f5d7fab..9aa05ddb 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 + #![doc = include_str!("../README.md")] #![deny(missing_docs)] #![deny(clippy::all)] diff --git a/testdata/make_certs.sh b/testdata/make_certs.sh index 9fb1d055..2e50ac12 100755 --- a/testdata/make_certs.sh +++ b/testdata/make_certs.sh @@ -1,4 +1,5 @@ #!env sh +# SPDX-License-Identifier: Apache-2.0 # Make CA key openssl req -nodes -new -x509 -keyout ca_key.pem -out ca_cert.pem -subj '/CN=MalwareDB Root CA/C=US/ST=Maryland/L=Baltimore/O=MalwareDB'