diff --git a/.gitignore b/.gitignore index 589577a..88c4209 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ webserv *.log large.jpg +webserv_tester +webserv_tester2 diff --git a/srcs/webserv/method_get.cpp b/srcs/webserv/method_get.cpp index f2ecc16..661b287 100644 --- a/srcs/webserv/method_get.cpp +++ b/srcs/webserv/method_get.cpp @@ -131,7 +131,8 @@ void Webserv::_autoindex(Client *client, const std::string &path) if (strcmp(".", ent->d_name) == 0) continue ; dir_list.append("get_rq_target()); +// dir_list.append(client->get_rq_target()); + dir_list.append(client->get_rq_abs_path()); if (dir_list[dir_list.size() - 1] != '/') dir_list.push_back('/'); dir_list.append(ent->d_name); diff --git a/telnet_test.sh b/telnet_test.sh index cd2d0e5..37efd05 100755 --- a/telnet_test.sh +++ b/telnet_test.sh @@ -1,41 +1,131 @@ -#!/bin/bash +#! /bin/bash -# no idea what we're doing here... +# you need to put absolutely everything in "" -PORT=80 -METHOD="GET" -PATH="/" -HOST="duckduckgo.com" -HOST_FULL="$HOST $PORT" +#port="80" +port="4040" +path="/" +#host="duckduckgo.com" +host="localhost" -START="open $HOST_FULL" +########## +# Colors +########## -L1="$METHOD $PATH HTTP/1.1" -run() +_GREY='\033[30m' +_RED='\033[0;31m' +_GREEN='\033[32m' +_YELLOW='\033[33m' +_BLUE='\033[34m' +_PURPLE='\033[35m' +_CYAN='\033[36m' +_WHITE='\033[37m' +_END='\033[0m' + + + + + + +methods=(GET POST DELETE GUMBALL) + +#ports=($port ($port + 1)) + +https=(HTTP/1.1 HTTP/1.0) + + + +run_telnet() { -# echo "this is a test" - -# $TEL_START - -# spaw telnet localhost $PORT - - echo "$START" -# telnet $HOST_FULL -# echo + echo "open $host $port" sleep 1 -# echo "$L1" -# echo "GET / HTTP/1.1" -# echo "Host: duckduckgo.com" -# echo "Host: $HOST" + echo "$l1" + echo "$header" +# echo +## echo $body +# echo +# echo + echo echo + sleep 1 + +# ret = $(arg | telnet) + +} + +run_a_test() +{ + echo "----- $test_name -----" + echo +# run_telnet +# echo ${pid} + + run_telnet | telnet +# run_telnet + + echo + echo "----- end of test -----" +} + +run_all() +{ +# open_a_connection + +# run_a_test | telnet + + + test_to_run="$valid_get" + test_name=$valid_get_name + +# l1="$test_to_run" + header="Host: $host" + body= + +#while something i change headers + + for i in "${methods[@]}" + do + test_name="Test Method $i" + l1="$i $path ${https[0]}" + expected_result="something" + run_a_test + echo -e "${_RED}$expected_result${_END}" + echo + done + + +# consider running several tests in a single telnet connection } +# open telnet localhost 4040 +# GET / HTTP/1.1 +# Host: localhost +# more header stuff +# +# maybe a body + + + + +run_all + + + + + + + + + + + + + + -#echo $START -run diff --git a/telnet_test2.sh b/telnet_test2.sh index a73144b..204ff98 100755 --- a/telnet_test2.sh +++ b/telnet_test2.sh @@ -1,8 +1,16 @@ -#! /usr/bin/expect - -set timeout 20 -set Host "localhost 80" - -spawn telnet $Host +#! /bin/bash +echo "open duckduckgo.com 80" +sleep 1 +echo "GET / HTTP/1.1" +echo "Host: duckduckgo.com" +echo +echo +sleep 2 +#( +#echo open duckduckgo.com 80 +#echo "GET / HTTP/1.1" +#echo "Host: duckduckgo.com" +#echo "exit" +#) | telnet