From 52a454800f62ab9fdc0ed50b041b215daf57003d Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Fri, 26 Jan 2018 19:51:13 -0800 Subject: [PATCH] cleanup cors example --- Cargo.toml | 1 + examples/actix_web_cors/LICENSE | 201 -------------------- examples/actix_web_cors/backend/Cargo.toml | 22 +-- examples/actix_web_cors/backend/src/main.rs | 32 ++-- examples/actix_web_cors/backend/src/user.rs | 18 +- 5 files changed, 36 insertions(+), 238 deletions(-) delete mode 100644 examples/actix_web_cors/LICENSE diff --git a/Cargo.toml b/Cargo.toml index 46afb692c..adfc576e6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -104,4 +104,5 @@ members = [ "examples/tls", "examples/websocket", "examples/websocket-chat", + "examples/actix_web_cors/backend", ] diff --git a/examples/actix_web_cors/LICENSE b/examples/actix_web_cors/LICENSE deleted file mode 100644 index 261eeb9e9..000000000 --- a/examples/actix_web_cors/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/examples/actix_web_cors/backend/Cargo.toml b/examples/actix_web_cors/backend/Cargo.toml index 1bddc5f70..4cdd94b47 100644 --- a/examples/actix_web_cors/backend/Cargo.toml +++ b/examples/actix_web_cors/backend/Cargo.toml @@ -1,17 +1,17 @@ [package] -name = "Actix-web-CORS" +name = "actix-web-cors" version = "0.1.0" authors = ["krircc "] +workspace = "../../../" [dependencies] -serde = "^1.0.0" -serde_derive = "^1.0.0" -serde_json = "^1.0.0" -http = "^0.1.0" -num_cpus = "1.0" +serde = "1.0" +serde_derive = "1.0" +serde_json = "1.0" +http = "0.1" -actix = "^0.4.0" -actix-web = { git = "https://github.com/actix/actix-web" } -dotenv = "^0.10.0" -env_logger = "^0.5.0" -futures = "0.1" \ No newline at end of file +actix = "0.4.5" +actix-web = { path = "../../../" } +dotenv = "0.10" +env_logger = "0.5" +futures = "0.1" diff --git a/examples/actix_web_cors/backend/src/main.rs b/examples/actix_web_cors/backend/src/main.rs index 0a8504372..197e918b6 100644 --- a/examples/actix_web_cors/backend/src/main.rs +++ b/examples/actix_web_cors/backend/src/main.rs @@ -1,30 +1,27 @@ -#![allow(warnings)] - #[macro_use] extern crate serde_derive; extern crate serde; extern crate serde_json; extern crate futures; -extern crate num_cpus; extern crate actix; extern crate actix_web; extern crate env_logger; extern crate http; -use actix::*; -use actix_web::*; use std::env; +use http::header; +use actix_web::*; +use actix_web::middleware::cors; mod user; +use user::info; -use http::header; -use actix_web::middleware::cors; -use user:: info; fn main() { - ::std::env::set_var("RUST_LOG", "actix_web=info"); - let _ = env_logger::init(); + env::set_var("RUST_LOG", "actix_web=info"); + env_logger::init(); + let sys = actix::System::new("Actix-web-CORS"); - env::set_var("RUST_BACKTRACE", "1"); + HttpServer::new( || Application::new() .middleware(middleware::Logger::default()) @@ -32,11 +29,12 @@ fn main() { cors::Cors::build() .allowed_origin("http://localhost:1234") .allowed_methods(vec!["GET", "POST"]) - .allowed_headers(vec![header::AUTHORIZATION, header::ACCEPT]) - .allowed_header(header::CONTENT_TYPE) - .max_age(3600) - .finish().expect("Can not create CORS middleware") - .register(r); + .allowed_headers( + vec![header::AUTHORIZATION, + header::ACCEPT, header::CONTENT_TYPE]) + .max_age(3600) + .finish().expect("Can not create CORS middleware") + .register(r); r.method(Method::POST).a(info); })) .bind("127.0.0.1:8000").unwrap() @@ -44,4 +42,4 @@ fn main() { .start(); let _ = sys.run(); -} \ No newline at end of file +} diff --git a/examples/actix_web_cors/backend/src/user.rs b/examples/actix_web_cors/backend/src/user.rs index 3dcc7576a..ae172eff2 100644 --- a/examples/actix_web_cors/backend/src/user.rs +++ b/examples/actix_web_cors/backend/src/user.rs @@ -1,6 +1,6 @@ -use actix::*; use actix_web::*; -use futures::future::Future; +use futures::Future; + #[derive(Deserialize,Serialize, Debug)] struct Info { @@ -9,11 +9,11 @@ struct Info { password: String, confirm_password: String, } -pub fn info(mut req: HttpRequest) -> Box> { - req.json() - .from_err() - .and_then(|res: Info| { - Ok(httpcodes::HTTPOk.build().json(res)?) - }).responder() -} +pub fn info(req: HttpRequest) -> Box> { + req.json() + .from_err() + .and_then(|res: Info| { + Ok(httpcodes::HTTPOk.build().json(res)?) + }).responder() +}