42/42_INT_12_webserv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conclusion, no real php cgi

Browse Source
This commit is contained in:
Eric LAZO
2022-08-17 17:59:53 +02:00
parent b45ed52a2a
commit 4fdbb1e0eb
8 changed files with 130 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
srcs/cgi-bin/cgi Executable file
View File

@@ -0,0 +1,4 @@
#! /bin/bash
echo "status: 100\r\n"
echo "\r\n\r\n"
echo "hiii"

10
srcs/cgi-bin/tmp.php Executable file
View File

@@ -0,0 +1,10 @@
#! /usr/bin/php
<?php
if(isset($_FILE["fileToUpload"]))
echo "there is a file";
else
echo "\n\nHeader: something\r\n\r\nno file\r\n";
?>

49
srcs/cgi-bin/upload_file.php
View File

@@ -1,34 +1,26 @@
#! /bin/bash/php #! /usr/bin/php
<?php <?php
// $FileName=$_FILES['myFile']['filename'];
# $TmpName=$_FILES['myFile']['tmp_name'];
# move_uploaded_file($TmpName, $FileName);
# echo("File was uploaded successfully!");
// this part needs to be grabed from POST uri
$target_dir = "./www/user_files/";
//$target_dir = $_POST["upload_dir"]; $target_dir = "user_files/";
//$target_dir = $_GET["upload_dir"];
$target_file = $target_dir . basename($_FILES["fileToUpload"]["name"]); $target_file = $target_dir . basename($_FILES["fileToUpload"]["name"]);
$uploadOk = 1; $uploadOk = 1;
$fileType = strtolower(pathinfo($target_file,PATHINFO_EXTENSION)); $imageFileType = strtolower(pathinfo($target_file,PATHINFO_EXTENSION));
//$imageFileType = strtolower(pathinfo($target_file,PATHINFO_EXTENSION));
// Check if image file is a actual image or fake image // Check if image file is a actual image or fake image
//if(isset($_POST["submit"])) { if(isset($_POST["submit"])) {
// $check = getimagesize($_FILES["fileToUpload"]["tmp_name"]); $check = getimagesize($_FILES["fileToUpload"]["tmp_name"]);
// if($check !== false) { if($check !== false) {
// echo "File is an image - " . $check["mime"] . "."; echo "File is an image - " . $check["mime"] . ".";
// $uploadOk = 1; $uploadOk = 1;
// } else { } else {
// echo "File is not an image."; echo "File is not an image.";
// $uploadOk = 0; $uploadOk = 0;
// } }
//} }
// Check if file already exists // Check if file already exists
if (file_exists($target_file)) { if (file_exists($target_file)) {
@@ -43,11 +35,11 @@ if ($_FILES["fileToUpload"]["size"] > 500000) {
} }
// Allow certain file formats // Allow certain file formats
//if($imageFileType != "jpg" && $imageFileType != "png" && $imageFileType != "jpeg" if($imageFileType != "jpg" && $imageFileType != "png" && $imageFileType != "jpeg"
//&& $imageFileType != "gif" ) { && $imageFileType != "gif" ) {
// echo "Sorry, only JPG, JPEG, PNG & GIF files are allowed."; echo "Sorry, only JPG, JPEG, PNG & GIF files are allowed.";
// $uploadOk = 0; $uploadOk = 0;
//} }
// Check if $uploadOk is set to 0 by an error // Check if $uploadOk is set to 0 by an error
if ($uploadOk == 0) { if ($uploadOk == 0) {
@@ -62,4 +54,3 @@ if ($uploadOk == 0) {
} }
?> ?>

67
srcs/cgi-bin/upload_file1.php Executable file
View File

@@ -0,0 +1,67 @@
#! /usr/bin/php
<?php
// $FileName=$_FILES['myFile']['filename'];
# $TmpName=$_FILES['myFile']['tmp_name'];
# move_uploaded_file($TmpName, $FileName);
# echo("File was uploaded successfully!");
// this part needs to be grabed from POST uri
$target_dir = "./www/user_files/";
//$target_dir = $_POST["upload_dir"];
//$target_dir = $_GET["upload_dir"];
//$target_file = $target_dir . basename($_FILES["fileToUpload"]["name"]);
$target_file = $target_dir . basename($_FILES["myFile"]["name"]);
$uploadOk = 1;
$fileType = strtolower(pathinfo($target_file,PATHINFO_EXTENSION));
//$imageFileType = strtolower(pathinfo($target_file,PATHINFO_EXTENSION));
// Check if image file is a actual image or fake image
//if(isset($_POST["submit"])) {
// $check = getimagesize($_FILES["fileToUpload"]["tmp_name"]);
// if($check !== false) {
// echo "File is an image - " . $check["mime"] . ".";
// $uploadOk = 1;
// } else {
// echo "File is not an image.";
// $uploadOk = 0;
// }
//}
// Check if file already exists
if (file_exists($target_file)) {
echo "Sorry, file already exists.";
$uploadOk = 0;
}
// Check file size
if ($_FILES["fileToUpload"]["size"] > 500000) {
echo "Sorry, your file is too large.";
$uploadOk = 0;
}
// Allow certain file formats
//if($imageFileType != "jpg" && $imageFileType != "png" && $imageFileType != "jpeg"
//&& $imageFileType != "gif" ) {
// echo "Sorry, only JPG, JPEG, PNG & GIF files are allowed.";
// $uploadOk = 0;
//}
// Check if $uploadOk is set to 0 by an error
if ($uploadOk == 0) {
echo "Sorry, your file was not uploaded.";
// if everything is ok, try to upload file
} else {
if (move_uploaded_file($_FILES["fileToUpload"]["tmp_name"], $target_file)) {
echo "The file ". htmlspecialchars( basename( $_FILES["fileToUpload"]["name"])). " has been uploaded.";
} else {
echo "Sorry, there was an error uploading your file.";
}
}
?>

2
srcs/webserv/request.cpp
View File

@@ -53,7 +53,7 @@ int Webserv::_read_request(Client *client)
// ::print_special(client->raw_request); // ::print_special(client->raw_request);
// std::cerr << "__raw_request__\n" << client->raw_request << "\n______\n"; // DEBUG // std::cerr << "__raw_request__\n" << client->raw_request << "\n______\n"; // DEBUG
// print_special(client->raw_request); print_special(client->raw_request);
std::cerr << "client header complete: " << client->header_complete << "\n"; // DEBUG std::cerr << "client header complete: " << client->header_complete << "\n"; // DEBUG

3
srcs/webserv/run_loop.cpp
View File

@@ -26,7 +26,10 @@ void Webserv::_read_cgi_output(Client *client)
else if (ret == 0) else if (ret == 0)
std::cerr << "Madame s'il vous plait, du Ketchup pour mon hamburger" << " (AKA:ret=0)" << "\n"; std::cerr << "Madame s'il vous plait, du Ketchup pour mon hamburger" << " (AKA:ret=0)" << "\n";
else else
{
std::cerr << "NORMAL BEHAVIOR I THINK!\n"; // debug
client->cgi_output.append(buf, ret); client->cgi_output.append(buf, ret);
}
} }
void Webserv::_handle_epoll_error_cgi_fd(uint32_t events, Client *client) void Webserv::_handle_epoll_error_cgi_fd(uint32_t events, Client *client)

20
www/test/submit_form.html
View File

@@ -1,17 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head>
<title>Webserv test Something</title>
</head>
<body> <body>
<h1 style="text-align:center">Webserv in Test</h1>
<hr> <!--- <form action="/cgi-bin/tmp.php" method="post" enctype="multipart/form-data"> -->
<p style="text-align:center">Time to submit something:</p> <form action="/cgi-bin/upload_file.php" method="post" enctype="multipart/form-data">
<!-- <form action="./srcs/cgi-bin/upload_file.php" method="post" enctype="multipart/form-data"> --> Select image to upload:
<form action="/cgi-bin/upload_file.php" method="post" enctype="multipart/form-data"> <input type="file" name="fileToUpload" id="fileToUpload">
<!-- <input type="hidden" name="upload_dir" value="./www/uploaded/"> --> <input type="submit" value="Upload Image" name="submit">
<input type="file" id="fileToUpload" name="myFile"> </form>
<input type="submit" value="Upload File">
</form>
</body> </body>
</html> </html>

17
www/test/submit_form_old.html Normal file
View File

@@ -0,0 +1,17 @@
<!DOCTYPE html>
<html>
<head>
<title>Webserv test Something</title>
</head>
<body>
<h1 style="text-align:center">Webserv in Test</h1>
<hr>
<p style="text-align:center">Time to submit something:</p>
<!-- <form action="./srcs/cgi-bin/upload_file.php" method="post" enctype="multipart/form-data"> -->
<form action="/cgi-bin/upload_file.php" method="post" enctype="multipart/form-data">
<!-- <input type="hidden" name="upload_dir" value="./www/uploaded/"> -->
<input type="file" id="fileToUpload" name="fileToUpload">
<input type="submit" value="Upload File">
</form>
</body>
</html>