Skip to content

added throwing error codes to cgi handeling #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eschencode merged 1 commit into from
Apr 15, 2025
Merged

added throwing error codes to cgi handeling #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions cgi-bin/test1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/usr/bin/env python3
import cgi
import cgitb
cgitb.enable()

print("Content-type: text/html\n")
print("<html><body>")
print("<h1>Python CGI Test</h1>")

form = cgi.FieldStorage()
if "name" in form:
print(f"<p>Hello, {form['name'].value}!</p>")
else:
print("<p>No name provided</p>")

print("</body></html>")
34 changes: 21 additions & 13 deletions src/Cgi/Cgi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ static int checkFile( HttpRequest& req, std::string& interpreter ){

//get vectors
if( getVectors( req.getServer(), ext, path, req.getUri() ) == -1 ){
return( -1 );
return( 404);
}


Expand All @@ -91,7 +91,7 @@ static int checkFile( HttpRequest& req, std::string& interpreter ){

//return if no ending is found ".cgi"
if( dot == std::string::npos ){
return( -1 );
return( 404);
}


Expand All @@ -103,19 +103,18 @@ static int checkFile( HttpRequest& req, std::string& interpreter ){

//return if ending is not inside cgiExt
if( it == ext.end() ){
return( -1 );
return( 404);
}

// Construct the full file path by combining the root directory with the URI



std::string fullPath = "." + uri;

//check if file is accesible
if( access( fullPath.c_str(), X_OK ) == -1 ){
return( -1 );
if( access( fullPath.c_str(), F_OK ) == -1 ){
return( 404);
}
//check if file is executealbe
if( access( fullPath.c_str(), X_OK ) == -1 ){
return( 403);
}
std::vector< std::string >::iterator extIt = ext.begin();
std::vector< std::string >::iterator pathIt = path.begin();

Expand All @@ -129,10 +128,10 @@ static int checkFile( HttpRequest& req, std::string& interpreter ){
}
if( interpreter.empty() ){
//std::cerr << "DEBUG: No interpreter found for file extension " << end << std::endl;
return( -1 );
return( 500);
}
//std::cerr << "DEBUG: Interpreter for " << uri << " is " << interpreter << std::endl;
return( 0 );
return( 200 );
}

// COMMENTED OUT BECAUSE WE DONT NEED AND REQUEST DOESNT HAVE FD ANYMORE
Expand Down Expand Up @@ -373,6 +372,7 @@ static int parentProcess( HttpRequest& req, int* inputPipe, int* outputPipe, pid
close( outputPipe[0] );
kill( pid, SIGKILL );
waitpid( pid, &status, 0 );
throw(500);
return( -1 );
}

Expand All @@ -383,13 +383,15 @@ static int parentProcess( HttpRequest& req, int* inputPipe, int* outputPipe, pid
kill( pid, SIGKILL );
waitpid( pid, &status, 0 );
req.setResponseCode( 504 );
throw(504);
return( -1 );
}
else{
bytesRead = read( outputPipe[0], buffer, BUFFERSIZE - 1 );
if( bytesRead > MAX_BYTES ){
std::cerr << "CGI: Limit exceeded" << std::endl;
kill( pid, SIGKILL );
throw(500);
break;
}
if( bytesRead > 0 ){
Expand Down Expand Up @@ -429,6 +431,7 @@ int handleCgi( HttpRequest& req ){
//std::cout << "body size " << body.size() << "max body size " << maxBodySize << "\n";
if(body.size() > maxBodySize ){
std::cerr << RED << "ERROR: Cgi: POST TO BIG" << END << std::endl;
throw(413);
return (-1);//mabe add a error page here
}
while (!body.empty() && (body[body.size()-1] == '\n' || body[body.size()-1] == '\r')) {
Expand All @@ -439,21 +442,25 @@ int handleCgi( HttpRequest& req ){
}
//check file ending and access to it and store interpreter for executuing
std::string interpreter;
if( checkFile( req, interpreter ) == -1 ){
int checkFileRes = checkFile( req, interpreter );
if( checkFileRes != 200){
std::cerr << RED << "ERROR: Cgi: not found " << req.getUri() << END << \
std::endl;
throw(checkFileRes);
return( -1 );
}

//open pipes for sending data
if( pipe( inputPipe ) < 0 ){
std::cerr << RED << "ERROR: Cgi: Pipe" << END << std::endl;
throw(500);
return( -1 );
}

if( pipe( outputPipe ) < 0 ){
std::cerr << RED << "ERROR: Cgi: Pipe" << END << std::endl;
closePipe( inputPipe );
throw(500);
return( -1 );
}

Expand All @@ -466,6 +473,7 @@ int handleCgi( HttpRequest& req ){
std::cerr << RED << "ERROR: Cgi: Fork" << END << std::endl;
closePipe( inputPipe );
closePipe( outputPipe );
throw(500);
return( -1 );
}

Expand Down