Skip to content

Commit

Permalink
chore: bump plugin versions in Hipcheck confs and Hipcheck version
Browse files Browse the repository at this point in the history
  • Loading branch information
@j-lanson
j-lanson committed Jan 31, 2025
1 parent d1e974d commit f584698
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 48 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions config/Hipcheck.kdl
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
plugins {
plugin "mitre/activity" version="0.2.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/activity.kdl"
plugin "mitre/affiliation" version="0.2.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/affiliation.kdl"
plugin "mitre/binary" version="0.1.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/binary.kdl"
plugin "mitre/churn" version="0.2.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/churn.kdl"
plugin "mitre/entropy" version="0.2.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/entropy.kdl"
plugin "mitre/fuzz" version="0.1.1" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/fuzz.kdl"
plugin "mitre/review" version="0.1.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/review.kdl"
plugin "mitre/typo" version="0.1.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/typo.kdl"
plugin "mitre/activity" version="0.3.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/activity.kdl"
plugin "mitre/affiliation" version="0.3.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/affiliation.kdl"
plugin "mitre/binary" version="0.2.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/binary.kdl"
plugin "mitre/churn" version="0.3.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/churn.kdl"
plugin "mitre/entropy" version="0.3.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/entropy.kdl"
plugin "mitre/fuzz" version="0.2.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/fuzz.kdl"
plugin "mitre/review" version="0.2.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/review.kdl"
plugin "mitre/typo" version="0.2.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/typo.kdl"
}

patch {
Expand All @@ -22,7 +22,7 @@ analyze {
category "practices" {
analysis "mitre/activity" policy="(lte $ P52w)" weight=3
analysis "mitre/binary" {
binary-file #rel("Binary.toml")
binary-file #rel("Binary.kdl")
binary-file-threshold 0
}
analysis "mitre/fuzz" policy="(eq #t $)"
Expand All @@ -31,7 +31,7 @@ analyze {

category "attacks" {
analysis "mitre/typo" {
typo-file #rel("Typos.toml")
typo-file #rel("Typos.kdl")
count-threshold 0
}

Expand All @@ -42,12 +42,12 @@ analyze {
}

analysis "mitre/entropy" policy="(eq 0 (count (filter (gt 8.0) $)))" {
langs-file #rel("Langs.toml")
langs-file #rel("Langs.kdl")
entropy-threshold 10.0
commit-percentage 0.0
}
analysis "mitre/churn" policy="(lte (divz (count (filter (gt 3) $)) (count $)) 0.02)" {
langs-file #rel("Langs.toml")
langs-file #rel("Langs.kdl")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion dist/Containerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

FROM node:bookworm-slim

ARG HC_VERSION="3.9.1"
ARG HC_VERSION="3.10.0"

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion hipcheck/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Automatically assess and score software packages for supply chain risk.
keywords = ["security", "sbom"]
categories = ["command-line-utilities", "development-tools"]
readme = "../README.md"
version = "3.9.1"
version = "3.10.0"
edition = "2021"
license = "Apache-2.0"
homepage = "https://hipcheck.mitre.org"
Expand Down
6 changes: 3 additions & 3 deletions hipcheck/src/config.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ pub struct AffiliationConfig {
#[serde(default)]
pub struct BinaryConfig {
/// Binary file extension configuration file.
#[default = "Binary.toml"]
#[default = "Binary.kdl"]
pub binary_config_file: String,

/// Whether the analysis is active.
Expand Down Expand Up @@ -369,7 +369,7 @@ pub struct TypoConfig {
pub count_threshold: u64,

/// Path to a "typos file" containing necessary information for typo detection.
#[default = "Typos.toml"]
#[default = "Typos.kdl"]
pub typo_file: String,
}

Expand All @@ -378,7 +378,7 @@ pub struct TypoConfig {
#[serde(default)]
pub struct LanguagesConfig {
/// The file to pull language information from.
#[default = "Langs.toml"]
#[default = "Langs.kdl"]
pub langs_file: String,
}

Expand Down
25 changes: 11 additions & 14 deletions hipcheck/src/policy/config_to_policy.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ use std::{
};
use url::Url;

const PLUGIN_VERSION: &str = "0.1.0";
const FUZZ_PLUGIN_VERSION: &str = "0.1.1";

struct Context {
path: PathBuf,
}
Expand Down Expand Up @@ -164,7 +161,7 @@ fn parse_activity(
// Add the plugin
let plugin = PolicyPlugin::new(
PolicyPluginName::new("mitre/activity").unwrap(),
PluginVersion::new("0.2.0".to_string()),
PluginVersion::new("0.3.0".to_string()),
Some(ManifestLocation::Url(
Url::parse("https://hipcheck.mitre.org/dl/plugin/mitre/activity.kdl").unwrap(),
)),
Expand Down Expand Up @@ -213,7 +210,7 @@ fn parse_binary(
// Add the plugin
let plugin = PolicyPlugin::new(
PolicyPluginName::new("mitre/binary").unwrap(),
PluginVersion::new(PLUGIN_VERSION.to_string()),
PluginVersion::new("0.2.0".to_string()),
Some(ManifestLocation::Url(
Url::parse("https://hipcheck.mitre.org/dl/plugin/mitre/binary.kdl").unwrap(),
)),
Expand Down Expand Up @@ -247,7 +244,7 @@ fn parse_fuzz(
// Add the plugin
let plugin = PolicyPlugin::new(
PolicyPluginName::new("mitre/fuzz").unwrap(),
PluginVersion::new(FUZZ_PLUGIN_VERSION.to_string()),
PluginVersion::new("0.2.0".to_string()),
Some(ManifestLocation::Url(
Url::parse("https://hipcheck.mitre.org/dl/plugin/mitre/fuzz.kdl").unwrap(),
)),
Expand Down Expand Up @@ -285,7 +282,7 @@ fn parse_identity(
// Add the plugin
let plugin = PolicyPlugin::new(
PolicyPluginName::new("mitre/identity").unwrap(),
PluginVersion::new("0.2.0".to_string()),
PluginVersion::new("0.3.0".to_string()),
Some(ManifestLocation::Url(
Url::parse("https://hipcheck.mitre.org/dl/plugin/mitre/identity.kdl").unwrap(),
)),
Expand Down Expand Up @@ -323,7 +320,7 @@ fn parse_review(
// Add the plugin
let plugin = PolicyPlugin::new(
PolicyPluginName::new("mitre/review").unwrap(),
PluginVersion::new(PLUGIN_VERSION.to_string()),
PluginVersion::new("0.2.0".to_string()),
Some(ManifestLocation::Url(
Url::parse("https://hipcheck.mitre.org/dl/plugin/mitre/review.kdl").unwrap(),
)),
Expand Down Expand Up @@ -367,7 +364,7 @@ fn parse_typo(
// Add the plugin
let plugin = PolicyPlugin::new(
PolicyPluginName::new("mitre/typo").unwrap(),
PluginVersion::new(PLUGIN_VERSION.to_string()),
PluginVersion::new("0.2.0".to_string()),
Some(ManifestLocation::Url(
Url::parse("https://hipcheck.mitre.org/dl/plugin/mitre/typo.kdl").unwrap(),
)),
Expand Down Expand Up @@ -411,7 +408,7 @@ fn parse_affiliation(
// Add the plugin
let plugin = PolicyPlugin::new(
PolicyPluginName::new("mitre/affiliation").unwrap(),
PluginVersion::new("0.2.0".to_string()),
PluginVersion::new("0.3.0".to_string()),
Some(ManifestLocation::Url(
Url::parse("https://hipcheck.mitre.org/dl/plugin/mitre/affiliation.kdl").unwrap(),
)),
Expand Down Expand Up @@ -447,7 +444,7 @@ fn parse_churn(
value_threshold, percent_threshold,
);
let mut config = PolicyConfig::new();
let langs_path = pathbuf![&context.path, "Langs.toml"];
let langs_path = pathbuf![&context.path, "Langs.kdl"];
config
.insert(
"langs-file".to_string(),
Expand All @@ -458,7 +455,7 @@ fn parse_churn(
// Add the plugin
let plugin = PolicyPlugin::new(
PolicyPluginName::new("mitre/churn").unwrap(),
PluginVersion::new("0.2.0".to_string()),
PluginVersion::new("0.3.0".to_string()),
Some(ManifestLocation::Url(
Url::parse("https://hipcheck.mitre.org/dl/plugin/mitre/churn.kdl").unwrap(),
)),
Expand Down Expand Up @@ -494,7 +491,7 @@ fn parse_entropy(
value_threshold, percent_threshold
);
let mut config = PolicyConfig::new();
let langs_path = pathbuf![&context.path, "Langs.toml"];
let langs_path = pathbuf![&context.path, "Langs.kdl"];
config
.insert(
"langs-file".to_string(),
Expand All @@ -505,7 +502,7 @@ fn parse_entropy(
// Add the plugin
let plugin = PolicyPlugin::new(
PolicyPluginName::new("mitre/entropy").unwrap(),
PluginVersion::new("0.2.0".to_string()),
PluginVersion::new("0.3.0".to_string()),
Some(ManifestLocation::Url(
Url::parse("https://hipcheck.mitre.org/dl/plugin/mitre/entropy.kdl").unwrap(),
)),
Expand Down
26 changes: 13 additions & 13 deletions hipcheck/src/policy/test_example.kdl
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
plugins {
plugin "mitre/activity" version="0.2.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/activity.kdl"
plugin "mitre/binary" version="0.1.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/binary.kdl"
plugin "mitre/fuzz" version="0.1.1" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/fuzz.kdl"
plugin "mitre/identity" version="0.2.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/identity.kdl"
plugin "mitre/review" version="0.1.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/review.kdl"
plugin "mitre/typo" version="0.1.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/typo.kdl"
plugin "mitre/affiliation" version="0.2.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/affiliation.kdl"
plugin "mitre/churn" version="0.2.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/churn.kdl"
plugin "mitre/entropy" version="0.2.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/entropy.kdl"
plugin "mitre/activity" version="0.3.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/activity.kdl"
plugin "mitre/binary" version="0.2.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/binary.kdl"
plugin "mitre/fuzz" version="0.2.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/fuzz.kdl"
plugin "mitre/identity" version="0.3.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/identity.kdl"
plugin "mitre/review" version="0.2.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/review.kdl"
plugin "mitre/typo" version="0.2.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/typo.kdl"
plugin "mitre/affiliation" version="0.3.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/affiliation.kdl"
plugin "mitre/churn" version="0.3.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/churn.kdl"
plugin "mitre/entropy" version="0.3.0" manifest="https://hipcheck.mitre.org/dl/plugin/mitre/entropy.kdl"
}
patch {
plugin "mitre/github" {
Expand All @@ -20,7 +20,7 @@ analyze {
category "practices" weight=1 {
analysis "mitre/activity" policy="(lte $ P71w)" weight=1
analysis "mitre/binary" policy="(lte $ 0)" weight=1 {
binary-file "./config/Binary.toml"
binary-file "./config/Binary.kdl"
}
analysis "mitre/fuzz" policy="(eq #t $)" weight=1
analysis "mitre/identity" policy="(lte (divz (count (filter (eq #t) $)) (count $)) 0.2)" weight=1
Expand All @@ -29,7 +29,7 @@ analyze {

category "attacks" weight=1 {
analysis "mitre/typo" policy="(lte (count (filter (eq #t) $)) 0)" weight=1 {
typo-file "./config/Typos.toml"
typo-file "./config/Typos.kdl"
}

category "commit" weight=1 {
Expand All @@ -38,10 +38,10 @@ analyze {
}

analysis "mitre/churn" policy="(lte (divz (count (filter (gt 3) $)) (count $)) 0.02)" weight=1 {
langs-file "./config/Langs.toml"
langs-file "./config/Langs.kdl"
}
analysis "mitre/entropy" policy="(lte (divz (count (filter (gt 10) $)) (count $)) 0)" weight=1 {
langs-file "./config/Langs.toml"
langs-file "./config/Langs.kdl"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion site/config.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ footer = [
{ name = "Release Notes", url = "https://github.com/mitre/hipcheck/releases", external = true },
{ name = "Changelog", url = "https://github.com/mitre/hipcheck/blob/main/CHANGELOG.md", external = true },
{ name = "Packages", title = true },
{ name = "Hipcheck", url = "https://github.com/mitre/hipcheck/releases/tag/hipcheck-v3.9.1", external = true },
{ name = "Hipcheck", url = "https://github.com/mitre/hipcheck/releases/tag/hipcheck-v3.10.0", external = true },
{ name = "Rust Plugin SDK", url = "https://crates.io/crates/hipcheck-sdk", external = true },
],
[
Expand Down
2 changes: 1 addition & 1 deletion site/static/dl/install.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This installer delegates to the "real" installer included with each new
# release of Hipcheck.

$hc_version = "3.9.1"
$hc_version = "3.10.0"
$repo = "https://github.com/mitre/hipcheck"
$installer = "$repo/releases/download/hipcheck-v${hc_version}/hipcheck-installer.ps1"

Expand Down
2 changes: 1 addition & 1 deletion site/static/dl/install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This installer delegates to the "real" installer included with each new
# release of Hipcheck.

HC_VERSION="3.9.1"
HC_VERSION="3.10.0"
REPO="https://github.com/mitre/hipcheck"
INSTALLER="$REPO/releases/download/hipcheck-v$HC_VERSION/hipcheck-installer.sh"

Expand Down

0 comments on commit f584698

Please sign in to comment.