Fix gallery creation validation and validators returning incorrect er… (#263)

* Fix gallery creation validation and validators returning incorrect errors

* Remove docker image

* Add URL validation for pack files

* Remove unneeded dependencies
This commit is contained in:
Geometrically
2021-11-30 20:07:23 -07:00
committed by GitHub
parent 6740124364
commit a54b2db81b
11 changed files with 444 additions and 667 deletions

View File

@@ -1,11 +1,9 @@
use crate::file_hosting::S3Host;
use crate::health::scheduler::HealthCounters;
use crate::util::env::{parse_strings_from_var, parse_var};
use actix_cors::Cors;
use actix_ratelimit::errors::ARError;
use actix_ratelimit::{MemoryStore, MemoryStoreActor, RateLimiter};
use actix_web::{http, web, App, HttpServer};
use actix_web_prom::PrometheusMetricsBuilder;
use env_logger::Env;
use gumdrop::Options;
use log::{error, info, warn};
@@ -242,22 +240,11 @@ async fn main() -> std::io::Result<()> {
let store = MemoryStore::new();
// Get prometheus service
let mut prometheus = PrometheusMetricsBuilder::new("api")
.endpoint("/metrics")
.build()
.unwrap();
// Get custom service
let health = HealthCounters::new();
health.register(&mut prometheus);
health.schedule(pool.clone(), &mut scheduler);
info!("Starting Actix HTTP server!");
// Init App
HttpServer::new(move || {
App::new()
.wrap(prometheus.clone())
.wrap(health.clone())
.wrap(
Cors::default()
.allowed_methods(["GET", "POST", "DELETE", "PATCH", "PUT"])
@@ -343,6 +330,11 @@ fn check_env_vars() -> bool {
failed |= true;
}
if parse_strings_from_var("WHITELISTED_MODPACK_DOMAINS").is_none() {
warn!("Variable `WHITELISTED_MODPACK_DOMAINS` missing in dotenv or not a json array of strings");
failed |= true;
}
failed |= check_var::<String>("SITE_URL");
failed |= check_var::<String>("CDN_URL");
failed |= check_var::<String>("DATABASE_URL");