sigonasr2
/
SigPlace
1
1
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Include debug information for POST file uploading

Browse Source
main
sigonasr2, Sig, Sigo 3 years ago
parent a876531d49
commit e4af1ba79f
5 changed files with 69 additions and 44 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      out/DIRECTORY_LISTING
  2. 10
      out/articles/DIRECTORY_LISTING
  3. 12
      out/articles/test articles/DIRECTORY_LISTING
  4. 46
      out/codeBackground
  5. 25
      sigServer.java

14
out/DIRECTORY_LISTING
Unescape View File

@ -18,13 +18,13 @@
<body> <body>
<div class="contentBody"> <div class="contentBody">
<h2>Directory Listing for /</h2><div class="folderlisting"><a href="/.." class="icon">&#x1F4C1;</a><a href="/..">.. </a><a href="/.." class="nounderline">(Previous Directory)</a></div><div class="folderlisting"><a href="/articles" class="icon">&#x1F4C1;</a><a href="/articles">articles</a> 2022-05-11T20:17:07.361619Z gitpod 190</div> <h2>Directory Listing for /</h2><div class="folderlisting"><a href="/.." class="icon">&#x1F4C1;</a><a href="/..">.. </a><a href="/.." class="nounderline">(Previous Directory)</a></div><div class="folderlisting"><a href="/articles" class="icon">&#x1F4C1;</a><a href="/articles">articles</a> 2022-05-12T15:25:09.71463Z gitpod 190</div>
<div class="filelisting"><a href="/codeBackground" class="icon">&#x1F5CE;</a><a href="/codeBackground">codeBackground</a> 2022-05-11T20:17:07.273619Z gitpod 2635</div> <div class="filelisting"><a href="/codeBackground" class="icon">&#x1F5CE;</a><a href="/codeBackground">codeBackground</a> 2022-05-12T15:25:09.526631Z gitpod 2635</div>
<div class="filelisting"><a href="/otherpage.html" class="icon">&#x1F5CE;</a><a href="/otherpage.html">otherpage.html</a> 2022-05-11T20:17:07.333619Z gitpod 8892</div> <div class="filelisting"><a href="/otherpage.html" class="icon">&#x1F5CE;</a><a href="/otherpage.html">otherpage.html</a> 2022-05-12T15:25:09.634631Z gitpod 8892</div>
<div class="filelisting"><a href="/reset.css" class="icon">&#x1F5CE;</a><a href="/reset.css">reset.css</a> 2022-05-11T20:17:07.285619Z gitpod 1093</div> <div class="filelisting"><a href="/reset.css" class="icon">&#x1F5CE;</a><a href="/reset.css">reset.css</a> 2022-05-12T15:25:09.534631Z gitpod 1093</div>
<div class="filelisting"><a href="/sig.css" class="icon">&#x1F5CE;</a><a href="/sig.css">sig.css</a> 2022-05-11T20:17:07.297619Z gitpod 4702</div> <div class="filelisting"><a href="/sig.css" class="icon">&#x1F5CE;</a><a href="/sig.css">sig.css</a> 2022-05-12T15:25:09.542631Z gitpod 4702</div>
<div class="filelisting"><a href="/testfile.html" class="icon">&#x1F5CE;</a><a href="/testfile.html">testfile.html</a> 2022-05-11T20:17:07.333619Z gitpod 829</div> <div class="filelisting"><a href="/testfile.html" class="icon">&#x1F5CE;</a><a href="/testfile.html">testfile.html</a> 2022-05-12T15:25:09.634631Z gitpod 829</div>
<div class="filelisting"><a href="/uploadform.html" class="icon">&#x1F5CE;</a><a href="/uploadform.html">uploadform.html</a> 2022-05-11T20:17:07.337619Z gitpod 884</div> <div class="filelisting"><a href="/uploadform.html" class="icon">&#x1F5CE;</a><a href="/uploadform.html">uploadform.html</a> 2022-05-12T15:25:09.634631Z gitpod 884</div>
</div> <!--End Content Body--> </div> <!--End Content Body-->
<div class="codeForeground" id="codeForeground"></div> <div class="codeForeground" id="codeForeground"></div>

10
out/articles/DIRECTORY_LISTING
Unescape View File

@ -18,11 +18,11 @@
<body> <body>
<div class="contentBody"> <div class="contentBody">
<h2>Directory Listing for /articles/</h2><div class="folderlisting"><a href="/articles/.." class="icon">&#x1F4C1;</a><a href="/articles/..">.. </a><a href="/articles/.." class="nounderline">(Previous Directory)</a></div><div class="filelisting"><a href="/articles/curabitur vel tempus ex.article" class="icon">&#x1F5CE;</a><a href="/articles/curabitur vel tempus ex.article">curabitur vel tempus ex.article</a> 2022-05-11T20:17:07.257619Z gitpod 579</div> <h2>Directory Listing for /articles/</h2><div class="folderlisting"><a href="/articles/.." class="icon">&#x1F4C1;</a><a href="/articles/..">.. </a><a href="/articles/.." class="nounderline">(Previous Directory)</a></div><div class="filelisting"><a href="/articles/curabitur vel tempus ex.article" class="icon">&#x1F5CE;</a><a href="/articles/curabitur vel tempus ex.article">curabitur vel tempus ex.article</a> 2022-05-12T15:25:09.478631Z gitpod 579</div>
<div class="filelisting"><a href="/articles/sigplace1.article" class="icon">&#x1F5CE;</a><a href="/articles/sigplace1.article">sigplace1.article</a> 2022-05-11T20:17:07.265619Z gitpod 3807</div> <div class="filelisting"><a href="/articles/sigplace1.article" class="icon">&#x1F5CE;</a><a href="/articles/sigplace1.article">sigplace1.article</a> 2022-05-12T15:25:09.482631Z gitpod 3807</div>
<div class="folderlisting"><a href="/articles/test articles" class="icon">&#x1F4C1;</a><a href="/articles/test articles">test articles</a> 2022-05-11T20:17:07.353619Z gitpod 147</div> <div class="folderlisting"><a href="/articles/test articles" class="icon">&#x1F4C1;</a><a href="/articles/test articles">test articles</a> 2022-05-12T15:25:09.650631Z gitpod 147</div>
<div class="filelisting"><a href="/articles/curabitur vel tempus ex.article.html" class="icon">&#x1F5CE;</a><a href="/articles/curabitur vel tempus ex.article.html">curabitur vel tempus ex.article.html</a> 2022-05-11T20:17:07.341619Z gitpod 1296</div> <div class="filelisting"><a href="/articles/curabitur vel tempus ex.article.html" class="icon">&#x1F5CE;</a><a href="/articles/curabitur vel tempus ex.article.html">curabitur vel tempus ex.article.html</a> 2022-05-12T15:25:09.642631Z gitpod 1296</div>
<div class="filelisting"><a href="/articles/sigplace1.article.html" class="icon">&#x1F5CE;</a><a href="/articles/sigplace1.article.html">sigplace1.article.html</a> 2022-05-11T20:17:07.345619Z gitpod 4524</div> <div class="filelisting"><a href="/articles/sigplace1.article.html" class="icon">&#x1F5CE;</a><a href="/articles/sigplace1.article.html">sigplace1.article.html</a> 2022-05-12T15:25:09.642631Z gitpod 4524</div>
</div> <!--End Content Body--> </div> <!--End Content Body-->
<div class="codeForeground" id="codeForeground"></div> <div class="codeForeground" id="codeForeground"></div>

12
out/articles/test articles/DIRECTORY_LISTING
Unescape View File

@ -18,12 +18,12 @@
<body> <body>
<div class="contentBody"> <div class="contentBody">
<h2>Directory Listing for /articles/test articles/</h2><div class="folderlisting"><a href="/articles/test articles/.." class="icon">&#x1F4C1;</a><a href="/articles/test articles/..">.. </a><a href="/articles/test articles/.." class="nounderline">(Previous Directory)</a></div><div class="filelisting"><a href="/articles/test articles/test1.article" class="icon">&#x1F5CE;</a><a href="/articles/test articles/test1.article">test1.article</a> 2022-05-11T20:17:07.265619Z gitpod 1068</div> <h2>Directory Listing for /articles/test articles/</h2><div class="folderlisting"><a href="/articles/test articles/.." class="icon">&#x1F4C1;</a><a href="/articles/test articles/..">.. </a><a href="/articles/test articles/.." class="nounderline">(Previous Directory)</a></div><div class="filelisting"><a href="/articles/test articles/test1.article" class="icon">&#x1F5CE;</a><a href="/articles/test articles/test1.article">test1.article</a> 2022-05-12T15:25:09.514631Z gitpod 1068</div>
<div class="filelisting"><a href="/articles/test articles/test2.article" class="icon">&#x1F5CE;</a><a href="/articles/test articles/test2.article">test2.article</a> 2022-05-11T20:17:07.265619Z gitpod 764</div> <div class="filelisting"><a href="/articles/test articles/test2.article" class="icon">&#x1F5CE;</a><a href="/articles/test articles/test2.article">test2.article</a> 2022-05-12T15:25:09.514631Z gitpod 764</div>
<div class="filelisting"><a href="/articles/test articles/test3.article" class="icon">&#x1F5CE;</a><a href="/articles/test articles/test3.article">test3.article</a> 2022-05-11T20:17:07.269619Z gitpod 977</div> <div class="filelisting"><a href="/articles/test articles/test3.article" class="icon">&#x1F5CE;</a><a href="/articles/test articles/test3.article">test3.article</a> 2022-05-12T15:25:09.518631Z gitpod 977</div>
<div class="filelisting"><a href="/articles/test articles/test1.article.html" class="icon">&#x1F5CE;</a><a href="/articles/test articles/test1.article.html">test1.article.html</a> 2022-05-11T20:17:07.345619Z gitpod 1785</div> <div class="filelisting"><a href="/articles/test articles/test1.article.html" class="icon">&#x1F5CE;</a><a href="/articles/test articles/test1.article.html">test1.article.html</a> 2022-05-12T15:25:09.646631Z gitpod 1785</div>
<div class="filelisting"><a href="/articles/test articles/test2.article.html" class="icon">&#x1F5CE;</a><a href="/articles/test articles/test2.article.html">test2.article.html</a> 2022-05-11T20:17:07.349619Z gitpod 1481</div> <div class="filelisting"><a href="/articles/test articles/test2.article.html" class="icon">&#x1F5CE;</a><a href="/articles/test articles/test2.article.html">test2.article.html</a> 2022-05-12T15:25:09.650631Z gitpod 1481</div>
<div class="filelisting"><a href="/articles/test articles/test3.article.html" class="icon">&#x1F5CE;</a><a href="/articles/test articles/test3.article.html">test3.article.html</a> 2022-05-11T20:17:07.353619Z gitpod 1694</div> <div class="filelisting"><a href="/articles/test articles/test3.article.html" class="icon">&#x1F5CE;</a><a href="/articles/test articles/test3.article.html">test3.article.html</a> 2022-05-12T15:25:09.650631Z gitpod 1694</div>
</div> <!--End Content Body--> </div> <!--End Content Body-->
<div class="codeForeground" id="codeForeground"></div> <div class="codeForeground" id="codeForeground"></div>

46
out/codeBackground
Unescape View File

@ -7,34 +7,34 @@
BufferedReader in = new BufferedReader(new InputStreamReader(client.getInputStream())); BufferedReader in = new BufferedReader(new InputStreamReader(client.getInputStream()));
String requestLine,line; String requestLine,line;
ZonedDateTime modifiedDate = null; ZonedDateTime modifiedDate = null;
String boundary="";
boolean truncateUntilBoundary=false;
requestLine=in.readLine(); //Read the first line, this should be our request. requestLine=in.readLine(); //Read the first line, this should be our request.
if (requestLine!=null) { if (requestLine!=null) {
while (in.ready()) { while (in.ready()) {
line=in.readLine(); line=in.readLine();
if (!truncateUntilBoundary) {
System.out.println(line); System.out.println(line);
if (line.contains("If-Modified-Since: ")) {
String modifiedSince=line.replace("If-Modified-Since: ",""); if (boundary.length()>0) {
modifiedDate = ZonedDateTime.parse(modifiedSince,DateTimeFormatter.RFC_1123_DATE_TIME); if (line.equals(boundary)) {
//System.out.println("Found a modified date of: "+modifiedDate); truncateUntilBoundary=true;
} }
} }
String[] splitter = requestLine.split(Pattern.quote(" ")); } else
if (splitter.length==3) { if (line.contains(boundary)) {
//This is valid. System.out.println("<...>");
if (splitter[0].equals("GET")) { //This is a GET request. System.out.println("");
if (splitter[2].equals("HTTP/1.1")||splitter[2].equals("HTTP/2.0")) { System.out.println(line);
String[] requestSplit = splitter[1].split(Pattern.quote("?")); truncateUntilBoundary=false;
String requestloc = requestSplit[0]; } else
HashMap<String,String> requestParams = new HashMap<>(); if (line.contains("Content-Disposition: ")||line.contains("Content-Type: ")) {
if (requestSplit.length>1) { System.out.println(line);
String[] params = requestSplit[1].split(Pattern.quote("&"));
for (String s : params) {
String key = s.substring(0,s.indexOf('='));
String value = s.substring(s.indexOf('=')+1);
requestParams.put(key,value);
}
System.out.println(" ==Params for this request are: "+requestParams);
} }
if (requestloc.equals("/")) {
//Send default directory. if (line.contains("Content-Type: multipart/form-data; boundary=")) {
if (modifiedDate==null||modifiedDate.isBefore(GetLastModifiedDate(sigPlace.OUTDIR,"testfile.html"))) { boundary="--"+line.substring("Content-Type: multipart/form-data; boundary=".length());
} else
if (line.contains("If-Modified-Since: ")) {
String modifiedSince=line.replace("If-Modified-Since: ","");

25
sigServer.java
Unescape View File

@ -31,11 +31,36 @@ public class sigServer {
BufferedReader in = new BufferedReader(new InputStreamReader(client.getInputStream())); BufferedReader in = new BufferedReader(new InputStreamReader(client.getInputStream()));
String requestLine,line; String requestLine,line;
ZonedDateTime modifiedDate = null; ZonedDateTime modifiedDate = null;
/*String boundary="";
boolean truncateUntilBoundary=false;*/
requestLine=in.readLine(); //Read the first line, this should be our request. requestLine=in.readLine(); //Read the first line, this should be our request.
if (requestLine!=null) { if (requestLine!=null) {
while (in.ready()) { while (in.ready()) {
line=in.readLine(); line=in.readLine();
/*
if (!truncateUntilBoundary) {
System.out.println(line);
if (boundary.length()>0) {
if (line.equals(boundary)) {
truncateUntilBoundary=true;
}
}
} else
if (line.contains(boundary)) {
System.out.println("<...>");
System.out.println("");
System.out.println(line);
truncateUntilBoundary=false;
} else
if (line.contains("Content-Disposition: ")||line.contains("Content-Type: ")) {
System.out.println(line); System.out.println(line);
}*/
if (line.contains("Content-Type: multipart/form-data; boundary=")) {
boundary="--"+line.substring("Content-Type: multipart/form-data; boundary=".length());
} else
if (line.contains("If-Modified-Since: ")) { if (line.contains("If-Modified-Since: ")) {
String modifiedSince=line.replace("If-Modified-Since: ",""); String modifiedSince=line.replace("If-Modified-Since: ","");
modifiedDate = ZonedDateTime.parse(modifiedSince,DateTimeFormatter.RFC_1123_DATE_TIME); modifiedDate = ZonedDateTime.parse(modifiedSince,DateTimeFormatter.RFC_1123_DATE_TIME);

Write Preview
Loading…
Cancel
Save