erin
/
lila-chat
1
0
Fork 0
Code Issues 10 Pull Requests Projects 2 Releases Wiki Activity

Rename project & split into multiple files

pull/5/head
~erin 2021-07-17 11:40:05 -04:00
parent af7a71faba
commit 4520b3bd34
Signed by: erin
GPG Key ID: DA70E064A8C70F44
4 changed files with 224 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Cargo.lock generated
View File

@ -656,6 +656,16 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pogchat"
version = "0.2.0"
dependencies = [
"rocket",
"serde",
"serde_json",
"sha1",
]
[[package]]
name = "ppv-lite86"
version = "0.2.10"
@ -774,16 +784,6 @@ dependencies = [
"syn",
]
[[package]]
name = "registration"
version = "0.1.0"
dependencies = [
"rocket",
"serde",
"serde_json",
"sha1",
]
[[package]]
name = "remove_dir_all"
version = "0.5.3"

4
Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "registration"
version = "0.1.0"
name = "pogchat"
version = "0.2.0"
authors = ["Erin Nova <erin@the-system.eu.org>"]
edition = "2018"

209
src/auth.rs Normal file
View File

@ -0,0 +1,209 @@
extern crate sha1;
use serde::{Deserialize, Serialize};
use serde_json::Result;
use std::fs::{File, OpenOptions};
use std::io::prelude::*;
use std::io::{self, BufRead};
use std::path::Path;
// Struct to store basic user data
#[derive(Clone, Serialize, Deserialize)]
struct User {
name: String,
pin_hashed: String,
}
#[get("/")]
pub fn index() -> &'static str {
"API Info:
`POST /api/register/<name>/<pin>` Register the username with the pin provided if it doesn't already exist
`GET /api/users/<name>` Check if the user exists
`GET /api/users/<name>/<pin>` Check if the user exists, and if the pin provided matches
`POST /api/users/change/<name>/<pin>/<new-name>/<new-pin>` Change a users name and/or pin"
}
// The output is wrapped in a Result to allow matching on errors
// Returns an Iterator to the Reader of the lines of the file.
fn read_lines<P>(filename: P) -> io::Result<io::Lines<io::BufReader<File>>>
where P: AsRef<Path>, {
let file = File::open(filename)?;
Ok(io::BufReader::new(file).lines())
}
// Function to read json from file into the vector
fn read_json() -> Vec<User> {
// Create path to file
let path = Path::new("users.json");
let display = path.display();
let mut users: Vec<User> = Vec::new(); // Create an empty vector of users
// Read through the lines and append them to the array
if let Ok(lines) = read_lines(&path) {
for line in lines {
if let Ok(user) = line {
println!("{} contains:\n{}", display, &user);
// Parse line from file into a data structure
let user: User = serde_json::from_str(&user).unwrap();
users.push(user);
}
}
}
return users;
}
// Function to append the last value of the users vector to the file
fn append_json(users_list: &Vec<User>) -> Result<()> {
// Create a file to write to
let path = Path::new("users.json");
let display = path.display();
let mut file = match OpenOptions::new()
.write(true)
.create(true)
.append(true)
.open(&path){
Err(why) => panic!("couldn't create {}: {}", display, why),
Ok(file) => file,
};
// Serialize the last user value
let users_json = serde_json::to_string(&users_list[users_list.len()-1])?;
// Write to the file
match file.write_all(users_json.as_bytes()) {
Err(why) => panic!("couldn't write to {}: {}", display, why),
Ok(_) => println!("succesfully wrote to {}", display),
};
// Add newline
match file.write_all("\n".as_bytes()) {
Err(why) => panic!("couldn't write to {}: {}", display, why),
Ok(_) => println!("succesfully wrote to {}", display),
};
Ok(())
}
// Function to write whole vector of users to file
fn write_json(users_list: &Vec<User>) -> Result<()> {
// Create a file to write to
let path = Path::new("users.json");
let display = path.display();
let mut file = match OpenOptions::new()
.write(true)
.create(true)
.open(&path){
Err(why) => panic!("couldn't create {}: {}", display, why),
Ok(file) => file,
};
let mut users_json = String::new();
for i in 0..users_list.len() {
// Serialize the users
users_json += &serde_json::to_string(&users_list[i])?;
if i <= users_list.len()-2 { // don't append newline if it's the last element
users_json += "\n";
}
}
// Write to the file
match file.write_all(users_json.as_bytes()) {
Err(why) => panic!("couldn't write to {}: {}", display, why),
Ok(_) => println!("succesfully wrote to {}", display),
};
Ok(())
}
// Post request to register a user and pin
#[post("/api/register/<name>/<pin>")]
pub fn register_user(name: &str, pin: i32) -> String {
let mut users: Vec<User> = read_json(); // Create an array of users out of parsed json
for i in &users { // loop through elements of the vector
if i.name == name.to_lowercase() {
return "false".to_string();
};
};
let pin_hashed = sha1::Sha1::from(&pin.to_string()).digest().to_string();
users.push(User { name: name.to_string().to_lowercase(), pin_hashed: pin_hashed});
append_json(&users);
return format!("User {} registered with pin hash: {}", users[users.len()-1].name.to_string().to_lowercase(), users[users.len()-1].pin_hashed);
}
// Check if pin matches user
#[get("/api/users/<name>/<pin>")]
pub fn check_pin(name: &str, pin: i32) -> String {
let users: Vec<User> = read_json();
let hashed_pin_input = sha1::Sha1::from(&pin.to_string()).digest().to_string();
for i in &users { // loop through the vector
if i.name == name.to_lowercase() {
if i.pin_hashed == hashed_pin_input {
return "true".to_string();
} else {
return "Incorrect pin".to_string();
};
};
};
return format!("User {} does not exist.", name.to_string().to_lowercase());
}
// Change a users pin/name
#[post("/api/users/change/<name>/<pin>/<new_name>/<new_pin>")]
pub fn change(name: &str, pin: i32, new_name: &str, new_pin: i32) -> String {
let mut users: Vec<User> = read_json();
let hashed_pin_input = sha1::Sha1::from(&pin.to_string()).digest().to_string();
// Loop over elements in vector
for i in 0..users.len() {
if users[i].name == name.to_lowercase() { // make sure name exists
if users[i].pin_hashed == hashed_pin_input { // check if pin is correct
// Check wether to change name or name+pin
if users[i].name == new_name.to_lowercase() {
// check if new name already exists
for n in &users {
if n.name == new_name.to_lowercase() {
return format!("New name {} is already taken!", new_name.to_lowercase());
} else {
users[i].pin_hashed = sha1::Sha1::from(&new_pin.to_string()).digest().to_string();
write_json(&users);
return format!("User {}'s new pin hash is {}.", name.to_string().to_lowercase(), users[i].pin_hashed);
}
}
} else {
// check if new name already exists
for n in &users {
if n.name == new_name.to_lowercase() {
return format!("New name {} is already taken!", new_name.to_lowercase());
} else {
users[i].name = new_name.to_string().to_lowercase();
users[i].pin_hashed = sha1::Sha1::from(&new_pin.to_string()).digest().to_string();
write_json(&users);
return format!("User previously known as {} is now {}. Pin hash, if different, is {}", name.to_string(), users[i].name.to_string(), users[i].pin_hashed.to_string());
}
}
}
} else {
return format!("Incorrect pin for user {}!", name.to_string());
}
}
}
return format!("User {} not found.", name.to_string());
}
#[get("/api/users/<name>")]
pub fn get_user(name: &str) -> String {
let users: Vec<User> = read_json();
let found_user = users.iter().filter(|u| u.name == name.to_lowercase()).next();
match found_user {
Some(user) => format!("User {}", &user.name),
None => "User does not exist".to_string(),
}
}

204
src/main.rs
View File

@ -1,205 +1,7 @@
#[macro_use] extern crate rocket;
extern crate sha1;
use rocket::fairing::AdHoc;
use serde::{Deserialize, Serialize};
use serde_json::Result;
use std::fs::{File, OpenOptions};
use std::io::prelude::*;
use std::io::{self, BufRead};
use std::path::Path;
// Struct to store basic user data
#[derive(Clone, Serialize, Deserialize)]
struct User {
name: String,
pin_hashed: String,
}
#[get("/")]
fn index() -> &'static str {
"API Info:
`POST /api/register/<name>/<pin>` Register the username with the pin provided if it doesn't already exist
`GET /api/users/<name>` Check if the user exists
`GET /api/users/<name>/<pin>` Check if the user exists, and if the pin provided matches
`POST /api/users/change/<name>/<pin>/<new-name>/<new-pin>` Change a users name and/or pin"
}
// The output is wrapped in a Result to allow matching on errors
// Returns an Iterator to the Reader of the lines of the file.
fn read_lines<P>(filename: P) -> io::Result<io::Lines<io::BufReader<File>>>
where P: AsRef<Path>, {
let file = File::open(filename)?;
Ok(io::BufReader::new(file).lines())
}
// Function to read json from file into the vector
fn read_json() -> Vec<User> {
// Create path to file
let path = Path::new("users.json");
let display = path.display();
let mut users: Vec<User> = Vec::new(); // Create an empty vector of users
// Read through the lines and append them to the array
if let Ok(lines) = read_lines(&path) {
for line in lines {
if let Ok(user) = line {
println!("{} contains:\n{}", display, &user);
// Parse line from file into a data structure
let user: User = serde_json::from_str(&user).unwrap();
users.push(user);
}
}
}
return users;
}
// Function to append the last value of the users vector to the file
fn append_json(users_list: &Vec<User>) -> Result<()> {
// Create a file to write to
let path = Path::new("users.json");
let display = path.display();
let mut file = match OpenOptions::new()
.write(true)
.create(true)
.append(true)
.open(&path){
Err(why) => panic!("couldn't create {}: {}", display, why),
Ok(file) => file,
};
// Serialize the last user value
let users_json = serde_json::to_string(&users_list[users_list.len()-1])?;
// Write to the file
match file.write_all(users_json.as_bytes()) {
Err(why) => panic!("couldn't write to {}: {}", display, why),
Ok(_) => println!("succesfully wrote to {}", display),
};
// Add newline
match file.write_all("\n".as_bytes()) {
Err(why) => panic!("couldn't write to {}: {}", display, why),
Ok(_) => println!("succesfully wrote to {}", display),
};
Ok(())
}
// Function to write whole vector of users to file
fn write_json(users_list: &Vec<User>) -> Result<()> {
// Create a file to write to
let path = Path::new("users.json");
let display = path.display();
let mut file = match OpenOptions::new()
.write(true)
.create(true)
.open(&path){
Err(why) => panic!("couldn't create {}: {}", display, why),
Ok(file) => file,
};
let mut users_json = String::new();
for i in 0..users_list.len() {
// Serialize the users
users_json += &serde_json::to_string(&users_list[i])?;
if i <= users_list.len()-2 { // don't append newline if it's the last element
users_json += "\n";
}
}
// Write to the file
match file.write_all(users_json.as_bytes()) {
Err(why) => panic!("couldn't write to {}: {}", display, why),
Ok(_) => println!("succesfully wrote to {}", display),
};
Ok(())
}
// Post request to register a user and pin
#[post("/api/register/<name>/<pin>")]
fn register_user(name: &str, pin: i32) -> String {
let mut users: Vec<User> = read_json(); // Create an array of users out of parsed json
for i in &users { // loop through elements of the vector
if i.name == name.to_lowercase() {
return "false".to_string();
};
};
let pin_hashed = sha1::Sha1::from(&pin.to_string()).digest().to_string();
users.push(User { name: name.to_string().to_lowercase(), pin_hashed: pin_hashed});
append_json(&users);
return format!("User {} registered with pin hash: {}", users[users.len()-1].name.to_string().to_lowercase(), users[users.len()-1].pin_hashed);
}
// Check if pin matches user
#[get("/api/users/<name>/<pin>")]
fn check_pin(name: &str, pin: i32) -> String {
let users: Vec<User> = read_json();
let hashed_pin_input = sha1::Sha1::from(&pin.to_string()).digest().to_string();
for i in &users { // loop through the vector
if i.name == name.to_lowercase() {
if i.pin_hashed == hashed_pin_input {
return "true".to_string();
} else {
return "Incorrect pin".to_string();
};
};
};
return format!("User {} does not exist.", name.to_string().to_lowercase());
}
// Change a users pin/name
#[post("/api/users/change/<name>/<pin>/<new_name>/<new_pin>")]
fn change(name: &str, pin: i32, new_name: &str, new_pin: i32) -> String {
let mut users: Vec<User> = read_json();
let hashed_pin_input = sha1::Sha1::from(&pin.to_string()).digest().to_string();
// Loop over elements in vector
for i in 0..users.len() {
if users[i].name == name.to_lowercase() { // make sure name exists
if users[i].pin_hashed == hashed_pin_input { // check if pin is correct
// Check wether to change name or name+pin
if users[i].name == new_name.to_lowercase() {
users[i].pin_hashed = sha1::Sha1::from(&new_pin.to_string()).digest().to_string();
write_json(&users);
return format!("User {}'s new pin hash is {}.", name.to_string().to_lowercase(), users[i].pin_hashed);
} else {
// check if new name already exists
for n in &users {
if n.name == new_name.to_lowercase() {
return format!("New name {} is already taken!", new_name.to_lowercase());
} else {
users[i].name = new_name.to_string().to_lowercase();
users[i].pin_hashed = sha1::Sha1::from(&new_pin.to_string()).digest().to_string();
write_json(&users);
return format!("User previously known as {} is now {}. Pin hash, if different, is {}", name.to_string(), users[i].name.to_string(), users[i].pin_hashed.to_string());
}
}
}
} else {
return format!("Incorrect pin for user {}!", name.to_string());
}
}
}
return format!("User {} not found.", name.to_string());
}
#[get("/api/users/<name>")]
fn get_user(name: &str) -> String {
let users: Vec<User> = read_json();
let found_user = users.iter().filter(|u| u.name == name.to_lowercase()).next();
match found_user {
Some(user) => format!("User {}", &user.name),
None => "User does not exist".to_string(),
}
}
mod auth;
use auth::*;
#[launch]
fn rocket() -> _ {
@ -212,7 +14,7 @@ fn rocket() -> _ {
rocket::build()
.mount(
"/",
routes![index, get_user, register_user, check_pin, change],
routes![auth::index, auth::get_user, auth::register_user, auth::check_pin, auth::change],
)
.attach(cors_fairing)
}