mirror of
https://github.com/mCaptcha/mCaptcha.git
synced 2026-02-11 10:05:41 +00:00
using custom version of actix-codegen and cors for pow routes
This commit is contained in:
@@ -15,7 +15,6 @@
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
use actix_cors::Cors;
|
||||
use actix_web::web;
|
||||
use actix_web::*;
|
||||
|
||||
@@ -28,28 +27,19 @@ pub use super::mcaptcha::levels::I32Levels;
|
||||
use crate::api::v1::mcaptcha::stats::*;
|
||||
|
||||
pub fn services(cfg: &mut web::ServiceConfig) {
|
||||
use crate::define_resource;
|
||||
use crate::V1_API_ROUTES;
|
||||
let cors = actix_cors::Cors::default()
|
||||
.allow_any_origin()
|
||||
.allowed_methods(vec!["POST"])
|
||||
.allow_any_header()
|
||||
.max_age(3600)
|
||||
.send_wildcard();
|
||||
|
||||
define_resource!(
|
||||
cfg,
|
||||
V1_API_ROUTES.pow.verify_pow,
|
||||
Methods::CorsAllowAllPost,
|
||||
verify_pow::verify_pow
|
||||
);
|
||||
|
||||
define_resource!(
|
||||
cfg,
|
||||
V1_API_ROUTES.pow.get_config,
|
||||
Methods::CorsAllowAllPost,
|
||||
get_config::get_config
|
||||
);
|
||||
|
||||
define_resource!(
|
||||
cfg,
|
||||
V1_API_ROUTES.pow.validate_captcha_token,
|
||||
Methods::CorsAllowAllPost,
|
||||
verify_token::validate_captcha_token
|
||||
cfg.service(
|
||||
Scope::new(crate::V1_API_ROUTES.pow.scope)
|
||||
.wrap(cors)
|
||||
.service(verify_pow::verify_pow)
|
||||
.service(get_config::get_config)
|
||||
.service(verify_token::validate_captcha_token),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -58,30 +48,48 @@ pub mod routes {
|
||||
pub get_config: &'static str,
|
||||
pub verify_pow: &'static str,
|
||||
pub validate_captcha_token: &'static str,
|
||||
pub scope: &'static str,
|
||||
}
|
||||
|
||||
impl PoW {
|
||||
pub const fn new() -> Self {
|
||||
let scope = "/api/v1/pow/";
|
||||
PoW {
|
||||
get_config: "/api/v1/pow/config",
|
||||
verify_pow: "/api/v1/pow/verify",
|
||||
validate_captcha_token: "/api/v1/pow/siteverify",
|
||||
scope,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#[allow(non_camel_case_types, missing_docs)]
|
||||
pub struct post;
|
||||
impl actix_web::dev::HttpServiceFactory for post {
|
||||
fn register(self, __config: &mut actix_web::dev::AppService) {
|
||||
async fn post() -> impl Responder {
|
||||
HttpResponse::Ok()
|
||||
}
|
||||
let __resource = actix_web::Resource::new("/test/post")
|
||||
.guard(actix_web::guard::Post())
|
||||
.to(post);
|
||||
actix_web::dev::HttpServiceFactory::register(__resource, __config)
|
||||
//#[allow(non_camel_case_types, missing_docs)]
|
||||
//pub struct post;
|
||||
//impl actix_web::dev::HttpServiceFactory for post {
|
||||
// fn register(self, __config: &mut actix_web::dev::AppService) {
|
||||
// async fn post() -> impl Responder {
|
||||
// HttpResponse::Ok()
|
||||
// }
|
||||
// let __resource = actix_web::Resource::new("/test/post")
|
||||
// .guard(actix_web::guard::Post())
|
||||
// .to(post);
|
||||
// actix_web::dev::HttpServiceFactory::register(__resource, __config)
|
||||
// }
|
||||
//}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn scope_pow_works() {
|
||||
let pow = routes::PoW::new();
|
||||
assert_eq!(pow.get_config.strip_prefix(pow.scope).unwrap(), "config");
|
||||
assert_eq!(pow.verify_pow.strip_prefix(pow.scope).unwrap(), "verify");
|
||||
assert_eq!(
|
||||
pow.validate_captcha_token.strip_prefix(pow.scope).unwrap(),
|
||||
"siteverify"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user