tornadocontrib/web3-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hotfix for admin address changes (#39)

Browse Source
This commit is contained in:
David 2023-03-08 00:44:22 +01:00 committed by GitHub
parent 7b1b997c72
commit d25eed0bd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web3_proxy/src/frontend/admin.rs
View File

@ -21,7 +21,7 @@ use entities::{admin_trail, login, pending_login, rpc_key, user};
use ethers::{abi::AbiEncode, prelude::Address, types::Bytes}; use ethers::{abi::AbiEncode, prelude::Address, types::Bytes};
use hashbrown::HashMap; use hashbrown::HashMap;
use http::StatusCode; use http::StatusCode;
use log::{debug, warn}; use log::{debug, info, warn};
use migration::sea_orm::prelude::Uuid; use migration::sea_orm::prelude::Uuid;
use migration::sea_orm::{ use migration::sea_orm::{
self, ActiveModelTrait, ColumnTrait, EntityTrait, IntoActiveModel, QueryFilter, self, ActiveModelTrait, ColumnTrait, EntityTrait, IntoActiveModel, QueryFilter,
@ -130,7 +130,7 @@ pub async fn admin_login_get(
// TODO: accept a login_domain from the request? // TODO: accept a login_domain from the request?
domain: login_domain.parse().unwrap(), domain: login_domain.parse().unwrap(),
// In the case of the admin, the admin needs to sign the message, so we include this logic ... // In the case of the admin, the admin needs to sign the message, so we include this logic ...
address: admin_address.to_fixed_bytes(), // user_address.to_fixed_bytes(), address: admin_address.clone().to_fixed_bytes(), // user_address.to_fixed_bytes(),
// TODO: config for statement // TODO: config for statement
statement: Some("🦙🦙🦙🦙🦙".to_string()), statement: Some("🦙🦙🦙🦙🦙".to_string()),
// TODO: don't unwrap // TODO: don't unwrap
@ -145,6 +145,10 @@ pub async fn admin_login_get(
resources: vec![], resources: vec![],
}; };
let admin_address: Vec<u8> = admin_address
.to_fixed_bytes()
.into();
let db_conn = app.db_conn().context("login requires a database")?; let db_conn = app.db_conn().context("login requires a database")?;
let db_replica = app let db_replica = app
.db_replica() .db_replica()
@ -160,8 +164,11 @@ pub async fn admin_login_get(
"Could not find user in db".to_string(), "Could not find user in db".to_string(),
))?; ))?;
// TODO: Gotta check if encoding messes up things maybe ...
info!("Admin address is: {:?}", admin_address);
info!("Encoded admin address is: {:?}", admin_address);
let admin = user::Entity::find() let admin = user::Entity::find()
.filter(user::Column::Address.eq(admin_address.encode())) .filter(user::Column::Address.eq(admin_address))
.one(db_replica.conn()) .one(db_replica.conn())
.await? .await?
.ok_or(FrontendErrorResponse::BadRequest( .ok_or(FrontendErrorResponse::BadRequest(