4 files changed, 69 insertions, 9 deletions

diff --git a/src/errors.rs b/src/errors.rs
index 6b3195f..e513343 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -16,6 +16,9 @@ pub enum ServiceError {
     #[error("SQL error: {0}")]
     Sql(#[from] sqlx::Error),
 
+    #[error("Generic: {0}")]
+    Generic(#[from] Box<dyn std::error::Error>),
+
     #[error("Not Found")]
     NotFound,
 
@@ -23,10 +26,14 @@ pub enum ServiceError {
     NotAuthorized,
 }
 
-pub type StringResult<T = &'static str> = Result<T, ServiceError>;
+pub type StringResult<T = String> = Result<T, ServiceError>;
+
+pub type StrResult<T= &'static str> = Result<T, ServiceError>;
 
 pub type JsonResult<T> = Result<T, ServiceError>;
 
+pub type NoneResult = Result<(), ServiceError>;
+
 impl IntoResponse for ServiceError {
     fn into_response(self) -> Response {
         let body = body::boxed(body::Full::from(self.to_string()));
diff --git a/src/handlers/colonies.rs b/src/handlers/colonies.rs
index 37ec65a..cc9ee0e 100644
--- a/src/handlers/colonies.rs
+++ b/src/handlers/colonies.rs
@@ -1,15 +1,18 @@
 use std::sync::Arc;
 
-use axum::{Extension, Json};
-use sqlx::query_as;
+use axum::{Extension, Json, extract::Path};
+use axum_auth::AuthBearer;
+use sqlx::{query_as, query};
 
 use crate::{
-    errors::{JsonResult, ServiceError, StringResult},
+    errors::{JsonResult, ServiceError, StringResult, NoneResult},
     State,
 };
 
 use solarlib::colony::{User, UserData};
 
+use super::ships::check_bearer;
+
 #[derive(Debug, Clone)]
 pub struct DbUser {
     pub id: i32,
@@ -18,6 +21,12 @@ pub struct DbUser {
     pub ssh_authorized_keys: Vec<String>,
 }
 
+#[derive(Debug)]
+struct DbMeta {
+    pub uuid: String,
+    pub hostname: String,
+}
+
 impl From<DbUser> for User {
     fn from(o: DbUser) -> Self {
         Self {
@@ -44,3 +53,43 @@ pub async fn list_users(state: Extension<Arc<State>>) -> JsonResult<Json<UserDat
 
     Ok(Json(data))
 }
+
+pub async fn create_user(Json(new_user): Json<User>, state: Extension<Arc<State>>, AuthBearer(token): AuthBearer) -> NoneResult {
+    check_bearer(token)?;
+    let mut conn = state.conn.acquire().await?;
+
+    query!("INSERT INTO seed_users (name, groups, ssh_authorized_keys) VALUES ($1, $2, $3)", new_user.name, &new_user.groups, &new_user.ssh_authorized_keys)
+        .execute(&mut conn)
+        .await?;
+
+    Ok(())
+}
+
+pub async fn add_metadata(Path((uuid, hostname)): Path<(String, String)>, state: Extension<Arc<State>>, AuthBearer(token): AuthBearer) -> NoneResult {
+    check_bearer(token)?;
+    let mut conn = state.conn.acquire().await?;
+
+    query!("INSERT INTO planet_metadata (uuid, hostname) VALUES ($1, $2)", uuid, hostname).execute(&mut conn).await?;
+    Ok(())
+}
+
+pub async fn meta_data(Path(uuid): Path<String>, state: Extension<Arc<State>>) -> StringResult {
+    let mut conn = state.conn.acquire().await?;
+
+    let m = query_as!(DbMeta, "SELECT * FROM planet_metadata WHERE uuid=$1", uuid).fetch_one(&mut conn).await?;
+
+    Ok(format!("instance-id: {}\nlocal-hostname: {}", m.uuid, m.hostname))
+}
+
+pub async fn user_data(Path(_uuid): Path<String>, state: Extension<Arc<State>>) -> StringResult {
+    let mut conn = state.conn.acquire().await?;
+
+    let db_users = query_as!(DbUser, "SELECT * FROM seed_users").fetch_all(&mut conn).await?;
+
+    let users = db_users.into_iter().map(|u| u.into()).collect::<Vec<User>>();
+
+    let data = UserData { users };
+
+    Ok(format!("#cloud-config\n{}", serde_yaml::to_string(&data).unwrap()))
+
+}
diff --git a/src/handlers/ships.rs b/src/handlers/ships.rs
index 91944fc..3101e54 100644
--- a/src/handlers/ships.rs
+++ b/src/handlers/ships.rs
@@ -8,7 +8,7 @@ use sqlx::{query, query_as, Error as SqlxError};
 use tracing::log::warn;
 
 use crate::{
-    errors::{JsonResult, ServiceError, StringResult},
+    errors::{JsonResult, ServiceError, StringResult, StrResult},
     State,
 };
 
@@ -31,7 +31,7 @@ pub async fn new(
     Json(new_ship): Json<Ship>,
     state: Extension<Arc<State>>,
     AuthBearer(token): AuthBearer,
-) -> StringResult {
+) -> StrResult {
     check_bearer(token)?;
     let mut conn = state.conn.acquire().await?;
 
@@ -52,7 +52,7 @@ pub async fn delete(
     Path(shasum): Path<Sha256>,
     state: Extension<Arc<State>>,
     AuthBearer(token): AuthBearer,
-) -> StringResult {
+) -> StrResult {
     check_bearer(token)?;
     let mut conn = state.conn.acquire().await?;
 
@@ -89,7 +89,7 @@ pub async fn get(
     Ok(Json(db_ship))
 }
 
-fn check_bearer(token: String) -> Result<(), ServiceError> {
+pub fn check_bearer(token: String) -> Result<(), ServiceError> {
     let expected_token = match std::env::var("SHARED_KEY") {
         Ok(t) => t,
         Err(_) => {
diff --git a/src/main.rs b/src/main.rs
index 67b54ea..0fffe82 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -35,7 +35,7 @@ async fn main() {
         .with(tracing_subscriber::fmt::layer())
         .init();
 
-    let mut conn = PgPoolOptions::new()
+    let conn = PgPoolOptions::new()
         .max_connections(5)
         .connect(
             &std::env::var("DATABASE_URL")
@@ -55,6 +55,10 @@ async fn main() {
         .route("/ships/delete/:shasum", delete(handlers::ships::delete))
         .route("/ships/get/:shasum", get(handlers::ships::get))
         .route("/users/list", get(handlers::colonies::list_users))
+        .route("/users/add", post(handlers::colonies::create_user))
+        .route("/:uuid/user-data", get(handlers::colonies::user_data))
+        .route("/meta/:uuid/:hostname", post(handlers::colonies::add_metadata))
+        .route("/:uuid/meta-data", get(handlers::colonies::meta_data))
         .layer(
             ServiceBuilder::new()
                 .layer(HandleErrorLayer::new(|error: BoxError| async move {