Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

destroy all warnings

Browse Source 
make idiomatic binding elision

remove unused struct line item

put back warning about not handling mdns errors T.T
This commit is contained in:
Keagan McClelland
2022-01-10 17:16:14 -07:00
committed by Aiden McClelland
parent adeaabfa5f
commit da9fa31cff
10 changed files with 16 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appmgr/src/config/mod.rs
View File

@@ -1,7 +1,6 @@
use std::collections::{BTreeMap, BTreeSet}; use std::collections::{BTreeMap, BTreeSet};
use std::time::Duration; use std::time::Duration;
use bollard::container::KillContainerOptions;
use color_eyre::eyre::eyre; use color_eyre::eyre::eyre;
use futures::future::{BoxFuture, FutureExt}; use futures::future::{BoxFuture, FutureExt};
use indexmap::IndexSet; use indexmap::IndexSet;
@@ -13,7 +12,6 @@ use rpc_toolkit::command;
use serde_json::Value; use serde_json::Value;
use tracing::instrument; use tracing::instrument;
use crate::action::docker::DockerAction;
use crate::context::RpcContext; use crate::context::RpcContext;
use crate::db::model::CurrentDependencyInfo; use crate::db::model::CurrentDependencyInfo;
use crate::db::util::WithRevision; use crate::db::util::WithRevision;

266
appmgr/src/config/spec.rs
View File

@@ -1869,12 +1869,14 @@ impl fmt::Display for TorKeyPointer {
#[serde(tag = "target")] #[serde(tag = "target")]
pub enum SystemPointerSpec {} pub enum SystemPointerSpec {}
impl fmt::Display for SystemPointerSpec { impl fmt::Display for SystemPointerSpec {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, _f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "SYSTEM: {}", match *self {}) // write!(f, "SYSTEM: {}", match *self {})
Ok(())
} }
} }
impl SystemPointerSpec { impl SystemPointerSpec {
async fn deref<Db: DbHandle>(&self, db: &mut Db) -> Result<Value, ConfigurationError> { async fn deref<Db: DbHandle>(&self, _db: &mut Db) -> Result<Value, ConfigurationError> {
#[allow(unreachable_code)]
Ok(match *self {}) Ok(match *self {})
} }
} }
@@ -1898,7 +1900,7 @@ impl ValueSpec for SystemPointerSpec {
} }
async fn update<Db: DbHandle>( async fn update<Db: DbHandle>(
&self, &self,
ctx: &RpcContext, _ctx: &RpcContext,
db: &mut Db, db: &mut Db,
_manifest: &Manifest, _manifest: &Manifest,
_config_overrides: &BTreeMap<PackageId, Config>, _config_overrides: &BTreeMap<PackageId, Config>,
@@ -1907,9 +1909,10 @@ impl ValueSpec for SystemPointerSpec {
*value = self.deref(db).await?; *value = self.deref(db).await?;
Ok(()) Ok(())
} }
fn pointers(&self, value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> { fn pointers(&self, _value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
let mut pointers = BTreeSet::new(); let mut pointers = BTreeSet::new();
pointers.insert(ValueSpecPointer::System(self.clone())); pointers.insert(ValueSpecPointer::System(self.clone()));
#[allow(unreachable_code)]
Ok(pointers) Ok(pointers)
} }
fn requires(&self, _id: &PackageId, _value: &Value) -> bool { fn requires(&self, _id: &PackageId, _value: &Value) -> bool {
@@ -1919,256 +1922,3 @@ impl ValueSpec for SystemPointerSpec {
false false
} }
} }
#[cfg(test)]
mod test {
use rand::SeedableRng;
use super::*;
#[test]
fn test_config() {
let spec = serde_json::json!({
"randomEnum": {
"name": "Random Enum",
"type": "enum",
"default": "null",
"description": "This is not even real.",
"changeWarning": "Be careful chnaging this!",
"values": [
"null",
"option1",
"option2",
"option3"
]
},
"testnet": {
"name": "Testnet",
"type": "boolean",
"description": "determines whether your node is running ontestnet or mainnet",
"changeWarning": "Chain will have to resync!",
"default": false
},
"favoriteNumber": {
"name": "Favorite Number",
"type": "number",
"integral": false,
"description": "Your favorite number of all time",
"changeWarning": "Once you set this number, it can never be changed without severe consequences.",
"nullable": false,
"default": 7,
"range": "(-100,100]"
},
"secondaryNumbers": {
"name": "Unlucky Numbers",
"type": "list",
"subtype": "number",
"description": "Numbers that you like but are not your top favorite.",
"spec": {
"type": "number",
"integral": false,
"range": "[-100,200)"
},
"range": "[0,10]",
"default": [
2,
3
]
},
"rpcsettings": {
"name": "RPC Settings",
"type": "object",
"description": "rpc username and password",
"changeWarning": "Adding RPC users gives them special permissions on your node.",
"nullable": false,
"nullByDefault": false,
"spec": {
"laws": {
"name": "Laws",
"type": "object",
"description": "the law of the realm",
"nullable": true,
"nullByDefault": true,
"spec": {
"law1": {
"name": "First Law",
"type": "string",
"description": "the first law",
"nullable": true
},
"law2": {
"name": "Second Law",
"type": "string",
"description": "the second law",
"nullable": true
}
}
},
"rulemakers": {
"name": "Rule Makers",
"type": "list",
"subtype": "object",
"description": "the people who make the rules",
"range": "[0,2]",
"default": [],
"spec": {
"type": "object",
"spec": {
"rulemakername": {
"name": "Rulemaker Name",
"type": "string",
"description": "the name of the rule maker",
"nullable": false,
"default": {
"charset": "a-g,2-9",
"len": 12
}
},
"rulemakerip": {
"name": "Rulemaker IP",
"type": "string",
"description": "the ip of the rule maker",
"nullable": false,
"default": "192.168.1.0",
"pattern": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$",
"patternDescription": "may only contain numbers and periods"
}
}
}
},
"rpcuser": {
"name": "RPC Username",
"type": "string",
"description": "rpc username",
"nullable": false,
"default": "defaultrpcusername",
"pattern": "^[a-zA-Z]+$",
"patternDescription": "must contain only letters."
},
"rpcpass": {
"name": "RPC User Password",
"type": "string",
"description": "rpc password",
"nullable": false,
"default": {
"charset": "a-z,A-Z,2-9",
"len": 20
}
}
}
},
"advanced": {
"name": "Advanced",
"type": "object",
"description": "Advanced settings",
"nullable": false,
"nullByDefault": false,
"spec": {
"notifications": {
"name": "Notification Preferences",
"type": "list",
"subtype": "enum",
"description": "how you want to be notified",
"range": "[1,3]",
"default": [
"email"
],
"spec": {
"type": "enum",
"values": [
"email",
"text",
"call",
"push",
"webhook"
]
}
}
}
},
"bitcoinNode": {
"name": "Bitcoin Node Settings",
"type": "union",
"description": "The node settings",
"default": "internal",
"tag": {
"id": "type",
"name": "Type",
"variantNames": {}
},
"Variant": {
"internal": {
"lan-address": {
"name": "LAN Address",
"type": "pointer",
"subtype": "package",
"target": "lan-address",
"package-id": "bitcoind",
"description": "the lan address"
}
},
"external": {
"public-domain": {
"name": "Public Domain",
"type": "string",
"description": "the public address of the node",
"nullable": false,
"default": "bitcoinnode.com",
"pattern": ".*",
"patternDescription": "anything"
}
}
}
},
"port": {
"name": "Port",
"type": "number",
"integral": true,
"description": "the default port for your Bitcoin node. default: 8333, testnet: 18333, regtest: 18444",
"nullable": true,
"default": 8333,
"range": "[0, 9999]",
"units": "m/s"
},
"maxconnections": {
"name": "Max Connections",
"type": "string",
"description": "the maximum number of commections allowed to your Bitcoin node",
"nullable": true
},
"rpcallowip": {
"name": "RPC Allowed IPs",
"type": "list",
"subtype": "string",
"description": "external ip addresses that are authorized to access your Bitcoin node",
"changeWarning": "Any IP you allow here will have RPC access to your Bitcoin node.",
"range": "[1,10]",
"default": [
"192.168.1.1"
],
"spec": {
"type": "string",
"pattern": "((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|((^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$)|(^[a-z2-7]{16}\\.onion$)|(^([a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?\\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]$))",
"patternDescription": "must be a valid ipv4, ipv6, or domain name"
}
},
"rpcauth": {
"name": "RPC Auth",
"type": "list",
"subtype": "string",
"description": "api keys that are authorized to access your Bitcoin node.",
"range": "[0,*)",
"default": [],
"spec": {
"type": "string"
}
}
});
let spec: ConfigSpec = serde_json::from_value(spec).unwrap();
spec.validate(todo!()).unwrap();
let config = spec
.gen(&mut rand::rngs::StdRng::from_entropy(), &None)
.unwrap();
spec.matches(&config).unwrap();
}
}

4
appmgr/src/dependencies.rs
View File

@@ -110,9 +110,7 @@ impl DependencyError {
| (_, DependencyError::HealthChecksFailed { failures }) => { | (_, DependencyError::HealthChecksFailed { failures }) => {
DependencyError::HealthChecksFailed { failures } DependencyError::HealthChecksFailed { failures }
} }
(DependencyError::Transitive, _) | (_, DependencyError::Transitive) => { (DependencyError::Transitive, _) => DependencyError::Transitive,
DependencyError::Transitive
}
} }
} }
#[instrument(skip(ctx, db))] #[instrument(skip(ctx, db))]

4
appmgr/src/install/mod.rs
View File

@@ -126,8 +126,8 @@ pub async fn install(
match pde.take() { match pde.take() {
Some(PackageDataEntry::Installed { Some(PackageDataEntry::Installed {
installed, installed,
manifest: _manifest,
static_files, static_files,
..
}) => { }) => {
*pde = Some(PackageDataEntry::Updating { *pde = Some(PackageDataEntry::Updating {
install_progress: progress.clone(), install_progress: progress.clone(),
@@ -367,7 +367,7 @@ async fn cli_install(
} else { } else {
let params = match (target.split_once("@"), version_spec) { let params = match (target.split_once("@"), version_spec) {
(Some((pkg, v)), None) => serde_json::json!({ "id": pkg, "version-spec": v }), (Some((pkg, v)), None) => serde_json::json!({ "id": pkg, "version-spec": v }),
(Some((pkg, v)), Some(_)) => { (Some(_), Some(_)) => {
return Err(crate::Error::new( return Err(crate::Error::new(
eyre!("Invalid package id {}", target), eyre!("Invalid package id {}", target),
ErrorKind::InvalidRequest, ErrorKind::InvalidRequest,

2
appmgr/src/migration.rs
View File

@@ -1,6 +1,6 @@
use color_eyre::eyre::eyre; use color_eyre::eyre::eyre;
use emver::VersionRange; use emver::VersionRange;
use futures::{Future, FutureExt, TryFutureExt}; use futures::{Future, FutureExt};
use indexmap::IndexMap; use indexmap::IndexMap;
use patch_db::HasModel; use patch_db::HasModel;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};

2
appmgr/src/net/nginx.rs
View File

@@ -152,7 +152,6 @@ impl NginxControllerInner {
match self.interfaces.get_mut(&package) { match self.interfaces.get_mut(&package) {
None => { None => {
let info = PackageNetInfo { let info = PackageNetInfo {
_ip: ipv4,
interfaces: interface_map, interfaces: interface_map,
}; };
self.interfaces.insert(package, info); self.interfaces.insert(package, info);
@@ -225,7 +224,6 @@ impl NginxControllerInner {
} }
} }
struct PackageNetInfo { struct PackageNetInfo {
_ip: Ipv4Addr,
interfaces: BTreeMap<InterfaceId, InterfaceMetadata>, interfaces: BTreeMap<InterfaceId, InterfaceMetadata>,
} }
pub struct InterfaceMetadata { pub struct InterfaceMetadata {

2
appmgr/src/net/ssl.rs
View File

@@ -1,5 +1,5 @@
use std::cmp::Ordering; use std::cmp::Ordering;
use std::path::{Path, PathBuf}; use std::path::Path;
use color_eyre::eyre::eyre; use color_eyre::eyre::eyre;
use futures::FutureExt; use futures::FutureExt;

1
appmgr/src/s9pk/header.rs
View File

@@ -115,6 +115,7 @@ impl TableOfContents {
) )
}) })
} }
#[allow(dead_code)]
fn as_opt(fs: FileSection) -> Option<FileSection> { fn as_opt(fs: FileSection) -> Option<FileSection> {
if fs.position | fs.length == 0 { if fs.position | fs.length == 0 {
// 0/0 is not a valid file section // 0/0 is not a valid file section

2
appmgr/src/static_server.rs
View File

@@ -105,7 +105,7 @@ fn server_error() -> Response<Body> {
} }
async fn file_send( async fn file_send(
_valid_session: HasValidSession, _valid_session: HasValidSession,
ctx: &RpcContext, _ctx: &RpcContext,
path: impl AsRef<Path>, path: impl AsRef<Path>,
) -> Result<Response<Body>, Error> { ) -> Result<Response<Body>, Error> {
// Serve a file by asynchronously reading it by chunks using tokio-util crate. // Serve a file by asynchronously reading it by chunks using tokio-util crate.

2
rpc-toolkit

Submodule rpc-toolkit updated: bd1a1b8a31...b4d19d71e0