Merge pull request Working-From-Home#111 from whayter/master

Something cliquable
ggjulio · Nov 2, 2021 · a1051a8 · a1051a8
2 parents 86796b5 + 83906f4
commit a1051a8
Show file tree

Hide file tree

Showing 16 changed files with 165 additions and 160 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,8 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-#        os: [ubuntu-latest, macos-latest]
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, macos-latest]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/__tests__/get.js b/__tests__/get.js
@@ -2,7 +2,7 @@ const frisby = require('frisby');
 
 describe('webserv', function() {
 
-var baseUri = 'http://localhost:80/';
+var baseUri = 'http://localhost:8080/';
 
 // FileReader(""); read index.php and compare content to see if it match response body
 
@@ -15,14 +15,14 @@ it ('GET /favicon.ico', function () {
   .expect('status', 200)
 });
 
-it ('GET localhost:80/', function () {
+it ('GET localhost:8080/', function () {
   return frisby
   .get(baseUri)
   .expect('status', 200)
   .expectNot('bodyContains', '<?php')
 });
 
-it ('GET localhost:80/index.php', function () {
+it ('GET localhost:8080/index.php', function () {
   return frisby
   .get(baseUri + 'index.php')
   .expect('status', 200)
@@ -33,7 +33,7 @@ it ('GET localhost:80/index.php', function () {
   .expectNot('bodyContains', '<?php')
 });
 
-it ('GET localhost:80/cgiParams.php?query=working', function () {
+it ('GET localhost:8080/cgiParams.php?query=working', function () {
   return frisby
   .get(baseUri + 'cgiParams.php?query=working')
   .expect('status', 200)
@@ -46,7 +46,7 @@ it ('GET localhost:80/cgiParams.php?query=working', function () {
   .expect('bodyContains', 'query=working')
 });
 
-it ('GET localhost:80/cgiParams.php?webserv=done', function () {
+it ('GET localhost:8080/cgiParams.php?webserv=done', function () {
   return frisby
   .get(baseUri + 'cgiParams.php?webserv=done')
   .expect('status', 200)
@@ -59,38 +59,38 @@ it ('GET localhost:80/cgiParams.php?webserv=done', function () {
   .expect('bodyContains', 'webserv=done')
 });
 
-it ('GET localhost:80/subject.html', function () {
+it ('GET localhost:8080/subject.html', function () {
   return frisby
   .get(baseUri + '/subject.html')
   .expect('status', 200)
   .expect('header', 'content-type', "text/html")
   .expect('bodyContains', 'Mandatory part')
 });
 
-it ('GET localhost:80/NotExist', function () {
+it ('GET localhost:8080/NotExist', function () {
   return frisby
   .get(baseUri + '/NotExist')
   .expect('status', 404)
   .expect('bodyContains', 'Seems like your page doesn\'t exist anymore')
 });
 
-it ('GET localhost:80/emptyFile.html', function () {
+it ('GET localhost:8080/emptyFile.html', function () {
   return frisby
   .get(baseUri + '/emptyFile.html')
   .expect('status', 200)
   .expect('header', 'content-type', "text/html")
   .expect('header', 'content-length', "0")
 });
 
-it ('GET localhost:80/emptyFile.php', function () {
+it ('GET localhost:8080/emptyFile.php', function () {
   return frisby
   .get(baseUri + '/emptyFile.php')
   .expect('status', 200)
   .expect('header', 'content-type', "text/html; charset=UTF-8")
   .expect('header', 'content-length', "0")
 });
 
-it ('GET localhost:80/autoindex', function () {
+it ('GET localhost:8080/autoindex', function () {
   return frisby
   .get(baseUri + 'autoindex')
   .expect('status', 200)
@@ -99,44 +99,44 @@ it ('GET localhost:80/autoindex', function () {
   .expect('bodyContains', 'teletubbies')
 });
 
-it ('GET localhost:80/bad_cgi', function () {
+it ('GET localhost:8080/bad_cgi', function () {
   return frisby
   .get(baseUri + 'bad_cgi')
   .expect('status', 500)
 });
 
-it ('GET localhost:81', function () {
+it ('GET localhost:8081', function () {
   return frisby
-  .get('http://localhost:81')
+  .get('http://localhost:8081')
   .expect('status', 200)
   .expect('bodyContains', '<?php')
 });
 
-it ('GET localhost:82', function () {
+it ('GET localhost:8082', function () {
   return frisby
-  .get('http://localhost:82/')
+  .get('http://localhost:8082/')
   .expect('status', 200)
   .expect('bodyContains', 'This project is here to make you write your HTTP server.')
 });
 
-it ('GET localhost:82/text', function () {
+it ('GET localhost:8082/text', function () {
   return frisby
-  .get('http://localhost:82/text')
+  .get('http://localhost:8082/text')
   .expect('status', 204)
   .expectNot('header', 'Content-Length')
   .expectNot('bodyContains', 'this is a return directive with text')
 });
 
-it ('GET localhost:82/uri', function () {
+it ('GET localhost:8082/uri', function () {
   return frisby
-  .get('http://localhost:82/uri')
+  .get('http://localhost:8082/uri')
   .expect('status', 200)
   .expect('bodyContains', 'Copyright The Closure Library Authors')
 });
 
-it ('GET localhost:83', function () {
+it ('GET localhost:8083', function () {
   return frisby
-  .get('http://localhost:83')
+  .get('http://localhost:8083')
   .expect('status', 200)
   .expect('bodyContains', 'index of /')
   .expect('bodyContains', 'Makefile')
@@ -145,79 +145,82 @@ it ('GET localhost:83', function () {
 //////////////////////////////////////////////////////////////////////////////
 /// POST ////////////////////////////////////////////////////////////////////
 
-it ('POST localhost:80/ with body size bigger than max_body_size', function () {
+let oneM = 1024 * 1024
+
+it ('POST localhost:8080/ with body size bigger than max_body_size', function () {
   return frisby
   .setup({
     request: {
-      body: "x".repeat(1025)
+      body: "x".repeat(oneM + 1)
     }
   })
-  .post(baseUri + 'test.html')
+  .post(baseUri + 'uploads/test.html')
   .expect('status', 413)
 });
 
-it ('POST localhost:80/ with body size way bigger than max_body_size', function () {
+it ('POST localhost:8080/ with body size way bigger than max_body_size', function () {
   return frisby
   .setup({
     request: {
-      body: "x".repeat(102500)
+      body: "x".repeat(oneM * 2)
     }
   })
-  .post(baseUri + 'test.html')
+  .post(baseUri + 'uploads/test.html')
   .expect('status', 413)
 });
 
-it ('POST localhost:80/ with body size = max_body_size', function () {
+it ('POST localhost:8080/ with body size = max_body_size', function () {
   return frisby
   .setup({
     request: {
-      body: "x".repeat(1024)
+      body: "x".repeat(oneM)
     }
   })
-  .post(baseUri + 'testPostMethod.html')
+  .post(baseUri + 'uploads/testPostMethod.html')
   .expect('status', 201)
 });
 
-it ('POST localhost:80/cgiParams.php', function () {
+it ('POST localhost:8080/cgiParams.php', function () {
   return frisby
   .setup({
     request: {
-      body: ""
+      body: "winston"
     }
   })
   .post(baseUri + 'cgiParams.php')
   .expect('status', 200)
   .expect('bodyContains', 'POST')
+  .expect('bodyContains', 'winston')
 });
 
 //////////////////////////////////////////////////////////////////////////////
 /// DELETE //////////////////////////////////////////////////////////////////  
 
-it ('DELETE http://localhost:80/testPostMethod.html', function () {
+it ('DELETE http://localhost:8080/testPostMethod.html', function () {
   return frisby
-    .del('http://localhost:80/testPostMethod.html')
+    .del('http://localhost:8080/testPostMethod.html')
     .expect('status', 405);
 });
 
-it ('DELETE http://localhost:84/testPostMethod.html', function () {
+it ('DELETE http://localhost:8080/uploads/testPostMethod.html', function () {
   return frisby
-    .del('http://localhost:84/testPostMethod.html')
+    .del('http://localhost:8080/uploads/testPostMethod.html')
     .expect('status', 200)
     .expect('bodyContains', 'File deleted')
 });
 
-it ('DELETE http://localhost:84/notExist.html', function () {
+it ('DELETE http://localhost:8080/uploads/notExist.html', function () {
   return frisby
-    .del('http://localhost:84/notExist.html')
+    .del('http://localhost:8080/uploads/notExist.html')
     .expect('status', 404)
 });
 
 //////////////////////////////////////////////////////////////////////////////
 /// PUT /////////////////////////////////////////////////////////////////////
 
-it ('PUT http://localhost:80 should return Not implemented 501', function () {
+it ('PUT http://localhost:8080 should return Not implemented 501', function () {
   return frisby
-  .put('http://localhost:80')
+  .put('http://localhost:8080')
   .expect('status', 501);
 });
 

diff --git a/cgi_tester b/cgi_tester
diff --git a/config/macos_webserv.conf b/config/macos_webserv.conf
@@ -1,35 +1,34 @@
 server {
-    listen 80;
+    listen 8080;
     root ./www;
     index index.php;
     server_name srv_one;
     error_page 404 ./404.html;
-    client_max_body_size 1K;
-    upload_store ./www/upload;
+    client_max_body_size 1M;
+    upload_store ./www/uploads;
 
     location / {
-        limit_except GET POST;
+        limit_except GET;
         autoindex on;
     }
     location ext .php {
         limit_except GET POST;
         cgi_exec /usr/local/bin/php-cgi;
         return 307 php-cgi;
     }
-    location ext .cgi {
-        limit_except GET POST;
-        cgi_exec ./cgi_tester;
-        return 307 cgi_tester;
-    }
     location /bad_cgi {
         cgi_exec ./README.md;
     }
     location /uri {
         return 301 http://youtube.com;
     }
+    location /uploads {
+        autoindex on;
+        limit_except GET POST DELETE;
+    }
 }
 server {
-    listen 81;
+    listen 8081;
     root ./www;
     index index.php;
     server_name srv_two;
@@ -38,7 +37,7 @@ server {
     }
 }
 server {
-    listen 82;
+    listen 8082;
     server_name srv_three;
     root ./www;
     index subject.html;
@@ -51,19 +50,10 @@ server {
     }
 }
 server {
-    listen 83;
+    listen 8083;
     index notExist;
     server_name srv_four;
     location / {
        autoindex on;
     }
-}
-server {
-    listen 84;
-    server_name server_five;
-    root ./www;
-    location / {
-        limit_except GET POST DELETE;
-        autoindex on;
-    }
 }