collarbone-annihilation/iu9-ca-web-chat
7
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 1 Wiki Activity

Compare commits

base: collarbone-annihilation:af537a7639b6c9b0f87f80e7f4301436df26ace4
Branches Tags
collarbone-annihilation:master
collarbone-annihilation:een9fix
collarbone-annihilation:anton_branch_2.0
collarbone-annihilation:karimov-adel-patch-1
collarbone-annihilation:fedor_branch
collarbone-annihilation:fed
collarbone-annihilation:vladimir_branch
collarbone-annihilation:adel_branch_2.0
collarbone-annihilation:adel_branch
collarbone-annihilation:front
collarbone-annihilation:249f5e6b78ffce6741fd8c6b4b1cb5e4031705cf
..
compare: collarbone-annihilation:49a4414bc80d242083c5c8f9553a11753798a0a2
Branches Tags
collarbone-annihilation:een9fix
collarbone-annihilation:master
collarbone-annihilation:anton_branch_2.0
collarbone-annihilation:karimov-adel-patch-1
collarbone-annihilation:fedor_branch
collarbone-annihilation:fed
collarbone-annihilation:vladimir_branch
collarbone-annihilation:adel_branch_2.0
collarbone-annihilation:adel_branch
collarbone-annihilation:front
collarbone-annihilation:249f5e6b78ffce6741fd8c6b4b1cb5e4031705cf

No commits in common. "af537a7639b6c9b0f87f80e7f4301436df26ace4" and "49a4414bc80d242083c5c8f9553a11753798a0a2" have entirely different histories.
af537a7639 ... 49a4414bc8

6 changed files with 15 additions and 29 deletions
Show Stats Expand all files Collapse all files

4
assets/html/chat.html
View File

@ -4,7 +4,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Веб-Чат</title> <title>Веб-Чат</title>
<link rel="stylesheet" href="/assets/css/chat.css"> <link rel="stylesheet" href="assets/css/chat.css">
</head> </head>
<body> <body>
<div class="chat-container"> <div class="chat-container">
@ -20,6 +20,6 @@
</div> </div>
</div> </div>
<script src="/assets/js/chat.js"></script> <script src="assets/js/chat.js"></script>
</body> </body>
</html> </html>

4
assets/html/list-rooms.html
View File

@ -4,7 +4,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Список Чат-Комнат</title> <title>Список Чат-Комнат</title>
<link rel="stylesheet" href="/assets/css/list-rooms.css"> <link rel="stylesheet" href="assets/css/list-rooms.css">
</head> </head>
<body> <body>
<div class="container"> <div class="container">
@ -47,6 +47,6 @@
</div> </div>
</div> </div>
<script src="/assets/js/list-rooms.js"></script> <script src="assets/js/list-rooms.js"></script>
</body> </body>
</html> </html>

6
assets/html/profile.html
View File

@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="stylesheet" href="/assets/css/profile.css"> <link rel="stylesheet" href="assets/css/profile.css">
<title>Профиль</title> <title>Профиль</title>
</head> </head>
<body> <body>
@ -13,7 +13,7 @@
<form> <form>
<div class="columns"> <div class="columns">
<div class="column"> <div class="column">
<img class="avatar" src="/assets/img/empty_avatar.png" id="avatar" height="200" width="200"><br> <img class="avatar" src="../img/empty_avatar.png" id="avatar" height="200" width="200"><br>
<input type="file" id="fileInput" style="display:none"> <input type="file" id="fileInput" style="display:none">
<button class="add" type="button" onclick="document.getElementById('fileInput').click();"></button><br> <button class="add" type="button" onclick="document.getElementById('fileInput').click();"></button><br>
</div> </div>
@ -30,7 +30,7 @@
</form> </form>
</div> </div>
<script src="/assets/js/list-rooms.js"> </script> <script src="assets/js/list-rooms.js"> </script>
</body> </body>
</html> </html>

4
assets/html/registration.html
View File

@ -4,7 +4,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Страница Регистрации</title> <title>Страница Регистрации</title>
<link rel="stylesheet" href="/assets/css/registration.css"> <link rel="stylesheet" href="assets/css/registration.css">
</head> </head>
<body> <body>
@ -17,7 +17,7 @@
<button type="submit">Зарегистрироваться</button> <button type="submit">Зарегистрироваться</button>
</form> </form>
</div> </div>
<script src="/assets/js/registration.js"></script> <script src="assets/js/registration.js"></script>
</body> </body>
</html> </html>

2
src/http_server/engine_engine_number_9/http_structures/client_request_parse.cpp
View File

@ -99,8 +99,6 @@ namespace een9 {
if (p.first == "Content-Length") { if (p.first == "Content-Length") {
collecting_body = res.has_body = true; collecting_body = res.has_body = true;
body_size = std::stoull(p.second); body_size = std::stoull(p.second);
if (body_size > 100000000)
THROW("Message content is too big");
res.body.reserve(body_size); res.body.reserve(body_size);
} }
} }

24
src/web_chat/main.cpp
View File

@ -57,9 +57,6 @@ int main(int argc, char** argv){
een9::StaticAssetManagerRule{assets_dir + "/html", "/assets/html", {{".html", "text/html"}} }, een9::StaticAssetManagerRule{assets_dir + "/html", "/assets/html", {{".html", "text/html"}} },
een9::StaticAssetManagerRule{assets_dir + "/css", "/assets/css", {{".css", "text/css"}} }, een9::StaticAssetManagerRule{assets_dir + "/css", "/assets/css", {{".css", "text/css"}} },
een9::StaticAssetManagerRule{assets_dir + "/js", "/assets/js", {{".js", "text/js"}} }, een9::StaticAssetManagerRule{assets_dir + "/js", "/assets/js", {{".js", "text/js"}} },
een9::StaticAssetManagerRule{assets_dir + "/img", "/assets/img", {
{".jpg", "image/jpg"}, {".png", "image/png"}, {".svg", "image/svg+xml"}
} },
}); });
een9::MainloopParameters params; een9::MainloopParameters params;
@ -71,24 +68,15 @@ int main(int argc, char** argv){
std::string text = unsafe_client_request_stringification(req); std::string text = unsafe_client_request_stringification(req);
return een9::form_http_server_response_200("text/plain", text); return een9::form_http_server_response_200("text/plain", text);
} }
auto rteee = [&](const std::string& asset_path) -> std::string { if (req.uri_path == "/" || req.uri_path == "/index.html") {
ret = samI.get_asset(asset_path, sa); for (auto& p: een9::split_html_query(req.uri_query)) {
printf("Query: %s = %s\n", p.first.c_str(), p.second.c_str());
}
printf("");
ret = samI.get_asset("/assets/html/test.html", sa);
een9_ASSERT_pl(ret == 0); een9_ASSERT_pl(ret == 0);
return een9::form_http_server_response_200(sa.type, sa.content); return een9::form_http_server_response_200(sa.type, sa.content);
};
if (req.uri_path == "/" || req.uri_path == "/list-rooms") {
return rteee("/assets/html/list-rooms.html");
} }
if (req.uri_path == "/chat") {
return rteee("/assets/html/chat.html");
}
if (req.uri_path == "/profile") {
return rteee("/assets/html/profile.html");
}
if (req.uri_path == "/registration") {
return rteee("/assets/html/registration.html");
}
/* Trying to interpret request as asset lookup */
ret = samI.get_asset(req.uri_path, sa); ret = samI.get_asset(req.uri_path, sa);
if (ret >= 0) { if (ret >= 0) {
return een9::form_http_server_response_200(sa.type, sa.content); return een9::form_http_server_response_200(sa.type, sa.content);