Applied new formatting

.rustfmt.toml

@@ -0,0 +1,2 @@
+imports_granularity = "Item"
+group_imports = "StdExternalCrate"

kraken-proto/src/convert.rs

@@ -1,14 +1,28 @@
-use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
+use std::net::IpAddr;
+use std::net::Ipv4Addr;
+use std::net::Ipv6Addr;
 use std::ops::RangeInclusive;
 
-use ipnetwork::{IpNetwork, Ipv4Network, Ipv6Network, NetworkSize};
+use ipnetwork::IpNetwork;
+use ipnetwork::Ipv4Network;
+use ipnetwork::Ipv6Network;
+use ipnetwork::NetworkSize;
 use thiserror::Error;
 use tonic::Status;
 
-use crate::shared::{
-    address, net, net_or_address, Address, Ipv4, Ipv4Net, Ipv6, Ipv6Net, Net, NetOrAddress,
-};
-use crate::{port_or_range, PortOrRange, PortRange};
+use crate::port_or_range;
+use crate::shared::address;
+use crate::shared::net;
+use crate::shared::net_or_address;
+use crate::shared::Address;
+use crate::shared::Ipv4;
+use crate::shared::Ipv4Net;
+use crate::shared::Ipv6;
+use crate::shared::Ipv6Net;
+use crate::shared::Net;
+use crate::shared::NetOrAddress;
+use crate::PortOrRange;
+use crate::PortRange;
 
 /// Error while converting a protobuf message to its rust type
 ///

kraken/src/api/extractors.rs

@@ -5,11 +5,14 @@ use std::ops::Deref;
 use actix_toolbox::tb_middleware::Session;
 use actix_web::dev::Payload;
 use actix_web::http::header::HeaderValue;
-use actix_web::{FromRequest, HttpRequest};
-use futures::future::{ready, Ready};
+use actix_web::FromRequest;
+use actix_web::HttpRequest;
+use futures::future::ready;
+use futures::future::Ready;
 use uuid::Uuid;
 
-use crate::api::handler::common::error::{ApiError, ApiResult};
+use crate::api::handler::common::error::ApiError;
+use crate::api::handler::common::error::ApiResult;
 
 /// Extractor for the `Session`'s `"uuid"` field
 pub struct SessionUser(pub Uuid);

kraken/src/api/handler/aggregation_source/schema.rs

@@ -1,19 +1,27 @@
 use std::net::IpAddr;
 
-use chrono::{DateTime, Utc};
-use serde::{Deserialize, Serialize};
+use chrono::DateTime;
+use chrono::Utc;
+use serde::Deserialize;
+use serde::Serialize;
 use utoipa::ToSchema;
 use uuid::Uuid;
 
-use crate::api::handler::attack_results::schema::{
-    FullDnsTxtScanResult, FullOsDetectionResult, FullQueryCertificateTransparencyResult, FullServiceDetectionResult,
-    FullUdpServiceDetectionResult, SimpleBruteforceSubdomainsResult, SimpleDnsResolutionResult,
-    SimpleHostAliveResult, SimpleQueryUnhashedResult,
-};
+use crate::api::handler::attack_results::schema::FullDnsTxtScanResult;
+use crate::api::handler::attack_results::schema::FullOsDetectionResult;
+use crate::api::handler::attack_results::schema::FullQueryCertificateTransparencyResult;
+use crate::api::handler::attack_results::schema::FullServiceDetectionResult;
+use crate::api::handler::attack_results::schema::FullUdpServiceDetectionResult;
+use crate::api::handler::attack_results::schema::SimpleBruteforceSubdomainsResult;
+use crate::api::handler::attack_results::schema::SimpleDnsResolutionResult;
+use crate::api::handler::attack_results::schema::SimpleHostAliveResult;
+use crate::api::handler::attack_results::schema::SimpleQueryUnhashedResult;
 use crate::api::handler::users::schema::SimpleUser;
-use crate::models::{
-    ManualHostCertainty, ManualPortCertainty, ManualServiceCertainty, OsType, PortProtocol,
-};
+use crate::models::ManualHostCertainty;
+use crate::models::ManualPortCertainty;
+use crate::models::ManualServiceCertainty;
+use crate::models::OsType;
+use crate::models::PortProtocol;
 
 /// Numbers how many attacks of a certain kind found an aggregated model
 #[derive(Copy, Clone, Serialize, Deserialize, ToSchema, Debug, Default)]

kraken/src/api/handler/aggregation_source/utils.rs

@@ -2,31 +2,58 @@ use std::collections::HashMap;
 
 use futures::TryStreamExt;
 use log::error;
-use rorm::conditions::{BoxedCondition, Condition, DynamicCollection};
+use rorm::and;
+use rorm::conditions::BoxedCondition;
+use rorm::conditions::Condition;
+use rorm::conditions::DynamicCollection;
 use rorm::db::transaction::Transaction;
 use rorm::fields::traits::FieldEq;
-use rorm::internal::field::{Field, FieldProxy};
-use rorm::{and, query, FieldAccess, Model};
+use rorm::internal::field::Field;
+use rorm::internal::field::FieldProxy;
+use rorm::query;
+use rorm::FieldAccess;
+use rorm::Model;
 use uuid::Uuid;
 
-use crate::api::handler::aggregation_source::schema::{
-    FullAggregationSource, ManualInsert, SimpleAggregationSource, SourceAttack, SourceAttackResult,
-};
-use crate::api::handler::attack_results::schema::{
-    DnsTxtScanEntry, FullDnsTxtScanResult, FullOsDetectionResult,
-    FullQueryCertificateTransparencyResult, FullServiceDetectionResult,
-    FullUdpServiceDetectionResult, SimpleBruteforceSubdomainsResult, SimpleDnsResolutionResult,
-    SimpleHostAliveResult, SimpleQueryUnhashedResult,
-};
+use crate::api::handler::aggregation_source::schema::FullAggregationSource;
+use crate::api::handler::aggregation_source::schema::ManualInsert;
+use crate::api::handler::aggregation_source::schema::SimpleAggregationSource;
+use crate::api::handler::aggregation_source::schema::SourceAttack;
+use crate::api::handler::aggregation_source::schema::SourceAttackResult;
+use crate::api::handler::attack_results::schema::DnsTxtScanEntry;
+use crate::api::handler::attack_results::schema::FullDnsTxtScanResult;
+use crate::api::handler::attack_results::schema::FullOsDetectionResult;
+use crate::api::handler::attack_results::schema::FullQueryCertificateTransparencyResult;
+use crate::api::handler::attack_results::schema::FullServiceDetectionResult;
+use crate::api::handler::attack_results::schema::FullUdpServiceDetectionResult;
+use crate::api::handler::attack_results::schema::SimpleBruteforceSubdomainsResult;
+use crate::api::handler::attack_results::schema::SimpleDnsResolutionResult;
+use crate::api::handler::attack_results::schema::SimpleHostAliveResult;
+use crate::api::handler::attack_results::schema::SimpleQueryUnhashedResult;
 use crate::api::handler::users::schema::SimpleUser;
-use crate::models::{
-    AggregationSource, AggregationTable, Attack, AttackType, BruteforceSubdomainsResult,
-    CertificateTransparencyResult, CertificateTransparencyValueName, DehashedQueryResult,
-    DnsResolutionResult, DnsTxtScanAttackResult, DnsTxtScanServiceHintEntry, DnsTxtScanSpfEntry,
-    HostAliveResult, ManualDomain, ManualHost, ManualPort, ManualService, OsDetectionResult,
-    ServiceDetectionName, ServiceDetectionResult, SourceType, UdpServiceDetectionName,
-    UdpServiceDetectionResult,
-};
+use crate::models::AggregationSource;
+use crate::models::AggregationTable;
+use crate::models::Attack;
+use crate::models::AttackType;
+use crate::models::BruteforceSubdomainsResult;
+use crate::models::CertificateTransparencyResult;
+use crate::models::CertificateTransparencyValueName;
+use crate::models::DehashedQueryResult;
+use crate::models::DnsResolutionResult;
+use crate::models::DnsTxtScanAttackResult;
+use crate::models::DnsTxtScanServiceHintEntry;
+use crate::models::DnsTxtScanSpfEntry;
+use crate::models::HostAliveResult;
+use crate::models::ManualDomain;
+use crate::models::ManualHost;
+use crate::models::ManualPort;
+use crate::models::ManualService;
+use crate::models::OsDetectionResult;
+use crate::models::ServiceDetectionName;
+use crate::models::ServiceDetectionResult;
+use crate::models::SourceType;
+use crate::models::UdpServiceDetectionName;
+use crate::models::UdpServiceDetectionResult;
 
 fn field_in<'a, T, F, P, Any>(
     field_proxy: FieldProxy<F, P>,

kraken/src/api/handler/api_keys/handler.rs

@@ -1,18 +1,32 @@
-use actix_web::web::{Json, Path};
-use actix_web::{delete, get, post, put, HttpResponse};
+use actix_web::delete;
+use actix_web::get;
+use actix_web::post;
+use actix_web::put;
+use actix_web::web::Json;
+use actix_web::web::Path;
+use actix_web::HttpResponse;
 use futures::TryStreamExt;
-use rand::distributions::{Alphanumeric, DistString};
+use rand::distributions::Alphanumeric;
+use rand::distributions::DistString;
 use rand::thread_rng;
+use rorm::and;
+use rorm::insert;
 use rorm::prelude::ForeignModelByField;
-use rorm::{and, insert, query, update, FieldAccess, Model};
+use rorm::query;
+use rorm::update;
+use rorm::FieldAccess;
+use rorm::Model;
 use uuid::Uuid;
 
 use crate::api::extractors::SessionUser;
-use crate::api::handler::api_keys::schema::{
-    CreateApiKeyRequest, FullApiKey, ListApiKeys, UpdateApiKeyRequest,
-};
-use crate::api::handler::common::error::{ApiError, ApiResult};
-use crate::api::handler::common::schema::{PathUuid, UuidResponse};
+use crate::api::handler::api_keys::schema::CreateApiKeyRequest;
+use crate::api::handler::api_keys::schema::FullApiKey;
+use crate::api::handler::api_keys::schema::ListApiKeys;
+use crate::api::handler::api_keys::schema::UpdateApiKeyRequest;
+use crate::api::handler::common::error::ApiError;
+use crate::api::handler::common::error::ApiResult;
+use crate::api::handler::common::schema::PathUuid;
+use crate::api::handler::common::schema::UuidResponse;
 use crate::chan::global::GLOBAL;
 use crate::models::LeechApiKey;
 

kraken/src/api/handler/api_keys/schema.rs

@@ -1,4 +1,5 @@
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
+use serde::Serialize;
 use utoipa::ToSchema;
 use uuid::Uuid;
 

kraken/src/api/handler/attack_results/handler.rs

@@ -1,35 +1,60 @@
 use std::collections::HashMap;
 
 use actix_web::get;
-use actix_web::web::{Json, Path, Query};
-use futures::{StreamExt, TryStreamExt};
+use actix_web::web::Json;
+use actix_web::web::Path;
+use actix_web::web::Query;
+use futures::StreamExt;
+use futures::TryStreamExt;
 use log::error;
-use rorm::{query, FieldAccess, Model};
+use rorm::query;
+use rorm::FieldAccess;
+use rorm::Model;
 use uuid::Uuid;
 
 use crate::api::extractors::SessionUser;
-use crate::api::handler::attack_results::schema::{
-    DnsTxtScanEntry, FullDnsTxtScanResult, FullOsDetectionResult,
-    FullQueryCertificateTransparencyResult, FullServiceDetectionResult,
-    FullUdpServiceDetectionResult, SimpleBruteforceSubdomainsResult, SimpleDnsResolutionResult,
-    SimpleHostAliveResult, SimpleQueryUnhashedResult,
-};
-use crate::api::handler::common::error::{ApiError, ApiResult};
-use crate::api::handler::common::schema::{
-    BruteforceSubdomainsResultsPage, DnsResolutionResultsPage, DnsTxtScanResultsPage,
-    HostAliveResultsPage, OsDetectionResultsPage, Page, PageParams, PathUuid,
-    QueryCertificateTransparencyResultsPage, QueryUnhashedResultsPage, ServiceDetectionResultsPage,
-    UdpServiceDetectionResultsPage,
-};
+use crate::api::handler::attack_results::schema::DnsTxtScanEntry;
+use crate::api::handler::attack_results::schema::FullDnsTxtScanResult;
+use crate::api::handler::attack_results::schema::FullOsDetectionResult;
+use crate::api::handler::attack_results::schema::FullQueryCertificateTransparencyResult;
+use crate::api::handler::attack_results::schema::FullServiceDetectionResult;
+use crate::api::handler::attack_results::schema::FullUdpServiceDetectionResult;
+use crate::api::handler::attack_results::schema::SimpleBruteforceSubdomainsResult;
+use crate::api::handler::attack_results::schema::SimpleDnsResolutionResult;
+use crate::api::handler::attack_results::schema::SimpleHostAliveResult;
+use crate::api::handler::attack_results::schema::SimpleQueryUnhashedResult;
+use crate::api::handler::common::error::ApiError;
+use crate::api::handler::common::error::ApiResult;
+use crate::api::handler::common::schema::BruteforceSubdomainsResultsPage;
+use crate::api::handler::common::schema::DnsResolutionResultsPage;
+use crate::api::handler::common::schema::DnsTxtScanResultsPage;
+use crate::api::handler::common::schema::HostAliveResultsPage;
+use crate::api::handler::common::schema::OsDetectionResultsPage;
+use crate::api::handler::common::schema::Page;
+use crate::api::handler::common::schema::PageParams;
+use crate::api::handler::common::schema::PathUuid;
+use crate::api::handler::common::schema::QueryCertificateTransparencyResultsPage;
+use crate::api::handler::common::schema::QueryUnhashedResultsPage;
+use crate::api::handler::common::schema::ServiceDetectionResultsPage;
+use crate::api::handler::common::schema::UdpServiceDetectionResultsPage;
 use crate::api::handler::common::utils::get_page_params;
 use crate::chan::global::GLOBAL;
-use crate::models::{
-    Attack, BruteforceSubdomainsResult, CertificateTransparencyResult,
-    CertificateTransparencyValueName, DehashedQueryResult, DnsResolutionResult,
-    DnsTxtScanAttackResult, DnsTxtScanServiceHintEntry, DnsTxtScanSpfEntry, HostAliveResult,
-    OsDetectionResult, ServiceCertainty, ServiceDetectionName, ServiceDetectionResult,
-    UdpServiceDetectionName, UdpServiceDetectionResult,
-};
+use crate::models::Attack;
+use crate::models::BruteforceSubdomainsResult;
+use crate::models::CertificateTransparencyResult;
+use crate::models::CertificateTransparencyValueName;
+use crate::models::DehashedQueryResult;
+use crate::models::DnsResolutionResult;
+use crate::models::DnsTxtScanAttackResult;
+use crate::models::DnsTxtScanServiceHintEntry;
+use crate::models::DnsTxtScanSpfEntry;
+use crate::models::HostAliveResult;
+use crate::models::OsDetectionResult;
+use crate::models::ServiceCertainty;
+use crate::models::ServiceDetectionName;
+use crate::models::ServiceDetectionResult;
+use crate::models::UdpServiceDetectionName;
+use crate::models::UdpServiceDetectionResult;
 
 /// Retrieve a bruteforce subdomains' results by the attack's id
 #[utoipa::path(

kraken/src/api/handler/attack_results/schema.rs

@@ -1,13 +1,17 @@
-use chrono::{DateTime, Utc};
+use chrono::DateTime;
+use chrono::Utc;
 use ipnetwork::IpNetwork;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
+use serde::Serialize;
 use utoipa::ToSchema;
 use uuid::Uuid;
 
-use crate::models::{
-    DnsRecordType, DnsTxtScanServiceHintType, DnsTxtScanSpfType, DnsTxtScanSummaryType, OsType,
-    ServiceCertainty,
-};
+use crate::models::DnsRecordType;
+use crate::models::DnsTxtScanServiceHintType;
+use crate::models::DnsTxtScanSpfType;
+use crate::models::DnsTxtScanSummaryType;
+use crate::models::OsType;
+use crate::models::ServiceCertainty;
 
 /// A simple representation of a bruteforce subdomains result
 #[derive(Serialize, Deserialize, ToSchema, Debug, Clone)]