Fix file uploading to completely accept and write binary files

main
Nic0Nic0Nii 3 years ago
parent ad134823a3
commit 4296d84226
  1. BIN
      Love_Live!_Logo.png
  2. 10
      out/DIRECTORY_LISTING
  3. 10
      out/articles/DIRECTORY_LISTING
  4. 2
      out/articles/curabitur vel tempus ex.article
  5. 2
      out/articles/curabitur vel tempus ex.article.html
  6. 2
      out/articles/sigplace1.article
  7. 2
      out/articles/sigplace1.article.html
  8. 12
      out/articles/test articles/DIRECTORY_LISTING
  9. 2
      out/articles/test articles/test1.article
  10. 2
      out/articles/test articles/test1.article.html
  11. 2
      out/articles/test articles/test2.article
  12. 2
      out/articles/test articles/test2.article.html
  13. 2
      out/articles/test articles/test3.article
  14. 2
      out/articles/test articles/test3.article.html
  15. 20
      out/codeBackground
  16. 20
      out/otherpage.html
  17. BIN
      out/uploads/Love_Live!_Logo.png
  18. BIN
      out/uploads/Untitled.png
  19. 44
      sigServer.java
  20. 1
      snippet

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 22 KiB

@ -30,7 +30,15 @@ bunch of random Java code.
<span class="variable">System</span>.<span class="variable">err</span>.<span class="function">println</span>(<span class="string">Failed to build directory listings!"</span>);
<span class="keyword">return</span>;
}</pre>
<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>
<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-19T19:07:02.131093Z gitpod 190</div>
<div class="filelisting"><a href="/codeBackground" class="icon">&#x1F5CE;</a><a href="/codeBackground">codeBackground</a> 2022-05-19T19:07:02.067093Z gitpod 2635</div>
<div class="filelisting"><a href="/otherpage.html" class="icon">&#x1F5CE;</a><a href="/otherpage.html">otherpage.html</a> 2022-05-19T19:07:02.103093Z gitpod 9684</div>
<div class="filelisting"><a href="/reset.css" class="icon">&#x1F5CE;</a><a href="/reset.css">reset.css</a> 2022-05-19T19:07:02.075093Z gitpod 1093</div>
<div class="filelisting"><a href="/sig.css" class="icon">&#x1F5CE;</a><a href="/sig.css">sig.css</a> 2022-05-19T19:07:02.083093Z gitpod 5175</div>
<div class="filelisting"><a href="/testfile.html" class="icon">&#x1F5CE;</a><a href="/testfile.html">testfile.html</a> 2022-05-19T19:07:02.107093Z gitpod 1621</div>
<div class="filelisting"><a href="/uploadform.html" class="icon">&#x1F5CE;</a><a href="/uploadform.html">uploadform.html</a> 2022-05-19T19:07:02.107093Z gitpod 1676</div>
<div class="folderlisting"><a href="/uploads" class="icon">&#x1F4C1;</a><a href="/uploads">uploads</a> 2022-05-19T14:49:27Z gitpod 6</div>
</div> <!--End Content Body-->
<div class="codeForeground" id="codeForeground"></div>
<div class="codeBackground" id="codeBackground"></div>

@ -30,11 +30,11 @@ bunch of random Java code.
<span class="variable">System</span>.<span class="variable">err</span>.<span class="function">println</span>(<span class="string">Failed to build directory listings!"</span>);
<span class="keyword">return</span>;
}</pre>
<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-19T03:42:49.8911626Z LAPTOP-NEAKT518\sigon (User) 582</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-19T03:42:49.9478986Z LAPTOP-NEAKT518\sigon (User) 2088</div>
<div class="filelisting"><a href="\articles\sigplace1.article" class="icon">&#x1F5CE;</a><a href="\articles\sigplace1.article">sigplace1.article</a> 2022-05-19T03:42:49.8946864Z LAPTOP-NEAKT518\sigon (User) 3821</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-19T03:42:49.9512871Z LAPTOP-NEAKT518\sigon (User) 5316</div>
<div class="folderlisting"><a href="\articles\test articles" class="icon">&#x1F4C1;</a><a href="\articles\test articles">test articles</a> 2022-05-19T03:42:49.9718854Z LAPTOP-NEAKT518\sigon (User) 4096</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-19T19:07:02.055093Z 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-19T19:07:02.059093Z 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-19T19:07:02.123093Z 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-19T19:07:02.111093Z gitpod 2088</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-19T19:07:02.115093Z gitpod 5316</div>
</div> <!--End Content Body-->
<div class="codeForeground" id="codeForeground"></div>

@ -1,3 +1,3 @@
<div class="contentWrapper"><h1>Curabitur vel tempus ex</h1><div class="content" id="content_out\articles\curabitur vel tempus ex.article">
<div class="contentWrapper"><h1>Curabitur vel tempus ex</h1><div class="content" id="content_out/articles/curabitur vel tempus ex.article">
<p>Curabitur vel tempus ex. Duis cursus sapien nisl, ut pulvinar dui porttitor ut. Nullam odio purus, tristique non turpis sit amet, malesuada ultricies purus. Mauris ut nulla nisl. Aenean sit amet est egestas justo volutpat consequat. Suspendisse in sagittis augue, et mattis tortor. Nullam viverra metus et nibh fringilla iaculis.</p>
</div><div class="datebar"></div><div class="date">29 Apr 2022 7:37PM</div>%CONDITIONAL_EXPAND%</div>

@ -30,7 +30,7 @@ bunch of random Java code.
<span class="variable">System</span>.<span class="variable">err</span>.<span class="function">println</span>(<span class="string">Failed to build directory listings!"</span>);
<span class="keyword">return</span>;
}</pre>
<div class="contentWrapper"><h1>Curabitur vel tempus ex</h1><div class="expandedContent" id="content_out\articles\curabitur vel tempus ex.article">
<div class="contentWrapper"><h1>Curabitur vel tempus ex</h1><div class="expandedContent" id="content_out/articles/curabitur vel tempus ex.article">
<p>Curabitur vel tempus ex. Duis cursus sapien nisl, ut pulvinar dui porttitor ut. Nullam odio purus, tristique non turpis sit amet, malesuada ultricies purus. Mauris ut nulla nisl. Aenean sit amet est egestas justo volutpat consequat. Suspendisse in sagittis augue, et mattis tortor. Nullam viverra metus et nibh fringilla iaculis.</p>
</div><div class="datebar"></div><div class="date">29 Apr 2022 7:37PM</div></div>

@ -1,4 +1,4 @@
<div class="contentWrapper"><h1>Welcome to SigPlace!</h1><div class="content" id="content_out\articles\sigplace1.article">
<div class="contentWrapper"><h1>Welcome to SigPlace!</h1><div class="content" id="content_out/articles/sigplace1.article">
<p> This is a SigPlace article! It will contain information that is important (probably) and will be layed out as such.</p>
<p> Paragraphs are automatically split up for readability and generated correctly via the parser. There's quite a bit of flexibility with the system and makes it easy to post updates should they be required.</p>
<p> A lot of content management systems would do this by having a web interface and submitting content and managing it that way, but by coding my own management system and using the built-in OS' filesystem to handle the work, I save myself a lot of pains and headaches.</p>

@ -30,7 +30,7 @@ bunch of random Java code.
<span class="variable">System</span>.<span class="variable">err</span>.<span class="function">println</span>(<span class="string">Failed to build directory listings!"</span>);
<span class="keyword">return</span>;
}</pre>
<div class="contentWrapper"><h1>Welcome to SigPlace!</h1><div class="expandedContent" id="content_out\articles\sigplace1.article">
<div class="contentWrapper"><h1>Welcome to SigPlace!</h1><div class="expandedContent" id="content_out/articles/sigplace1.article">
<p> This is a SigPlace article! It will contain information that is important (probably) and will be layed out as such.</p>
<p> Paragraphs are automatically split up for readability and generated correctly via the parser. There's quite a bit of flexibility with the system and makes it easy to post updates should they be required.</p>
<p> A lot of content management systems would do this by having a web interface and submitting content and managing it that way, but by coding my own management system and using the built-in OS' filesystem to handle the work, I save myself a lot of pains and headaches.</p>

@ -30,12 +30,12 @@ bunch of random Java code.
<span class="variable">System</span>.<span class="variable">err</span>.<span class="function">println</span>(<span class="string">Failed to build directory listings!"</span>);
<span class="keyword">return</span>;
}</pre>
<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-19T03:42:49.8963007Z LAPTOP-NEAKT518\sigon (User) 1071</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-19T03:42:49.9539501Z LAPTOP-NEAKT518\sigon (User) 2577</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-19T03:42:49.8982941Z LAPTOP-NEAKT518\sigon (User) 767</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-19T03:42:49.957395Z LAPTOP-NEAKT518\sigon (User) 2273</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-19T03:42:49.8999694Z LAPTOP-NEAKT518\sigon (User) 980</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-19T03:42:49.959957Z LAPTOP-NEAKT518\sigon (User) 2486</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-19T19:07:02.059093Z 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-19T19:07:02.059093Z 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-19T19:07:02.063093Z 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-19T19:07:02.115093Z gitpod 2577</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-19T19:07:02.119093Z gitpod 2273</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-19T19:07:02.123093Z gitpod 2486</div>
</div> <!--End Content Body-->
<div class="codeForeground" id="codeForeground"></div>

@ -1,3 +1,3 @@
<div class="contentWrapper"><h1>A Test Title</h1><div class="content" id="content_out\articles\test articles\test1.article">
<div class="contentWrapper"><h1>A Test Title</h1><div class="content" id="content_out/articles/test articles/test1.article">
<p> In dolor erat, malesuada at elit cursus, convallis imperdiet turpis. Ut aliquet magna tellus, at viverra mauris ullamcorper vehicula. Nam quis urna semper magna ornare elementum sed id mauris. Suspendisse faucibus nunc ante, ac rhoncus nisl tristique sed. Vestibulum pretium odio eget scelerisque vestibulum. Aliquam viverra ex ac vestibulum interdum. Donec ligula nunc, dignissim a purus vitae, fermentum laoreet diam. Quisque nec auctor urna. Vestibulum sit amet ligula ullamcorper, congue ipsum et, accumsan ante. Phasellus fermentum, sapien nec pulvinar blandit, elit purus pretium urna, et dapibus orci urna eu metus. Nunc molestie dictum pharetra. Suspendisse luctus felis et ante tristique, vitae commodo diam porttitor. Aliquam orci eros, placerat ac justo vitae, bibendum efficitur metus. Phasellus eget bibendum mauris.</p>
</div><div class="datebar"></div><div class="date">2 May 2022 10:16AM</div>%CONDITIONAL_EXPAND%</div>

@ -30,7 +30,7 @@ bunch of random Java code.
<span class="variable">System</span>.<span class="variable">err</span>.<span class="function">println</span>(<span class="string">Failed to build directory listings!"</span>);
<span class="keyword">return</span>;
}</pre>
<div class="contentWrapper"><h1>A Test Title</h1><div class="expandedContent" id="content_out\articles\test articles\test1.article">
<div class="contentWrapper"><h1>A Test Title</h1><div class="expandedContent" id="content_out/articles/test articles/test1.article">
<p> In dolor erat, malesuada at elit cursus, convallis imperdiet turpis. Ut aliquet magna tellus, at viverra mauris ullamcorper vehicula. Nam quis urna semper magna ornare elementum sed id mauris. Suspendisse faucibus nunc ante, ac rhoncus nisl tristique sed. Vestibulum pretium odio eget scelerisque vestibulum. Aliquam viverra ex ac vestibulum interdum. Donec ligula nunc, dignissim a purus vitae, fermentum laoreet diam. Quisque nec auctor urna. Vestibulum sit amet ligula ullamcorper, congue ipsum et, accumsan ante. Phasellus fermentum, sapien nec pulvinar blandit, elit purus pretium urna, et dapibus orci urna eu metus. Nunc molestie dictum pharetra. Suspendisse luctus felis et ante tristique, vitae commodo diam porttitor. Aliquam orci eros, placerat ac justo vitae, bibendum efficitur metus. Phasellus eget bibendum mauris.</p>
</div><div class="datebar"></div><div class="date">2 May 2022 10:16AM</div></div>

@ -1,3 +1,3 @@
<div class="contentWrapper"><h1>Another test title</h1><div class="content" id="content_out\articles\test articles\test2.article">
<div class="contentWrapper"><h1>Another test title</h1><div class="content" id="content_out/articles/test articles/test2.article">
<p> Sed lobortis nisi id nunc tincidunt volutpat. Mauris cursus felis quis condimentum posuere. Pellentesque vitae dolor et justo suscipit ultrices. Integer dapibus leo id felis varius, ut volutpat massa bibendum. Quisque sed nunc arcu. In sit amet faucibus magna, non venenatis massa. Cras sed placerat risus, id consectetur est. Pellentesque in nunc dolor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Quisque eget lorem ac urna posuere accumsan. Quisque sed imperdiet nisi.</p>
</div><div class="datebar"></div><div class="date">1 May 2022 05:13AM</div>%CONDITIONAL_EXPAND%</div>

@ -30,7 +30,7 @@ bunch of random Java code.
<span class="variable">System</span>.<span class="variable">err</span>.<span class="function">println</span>(<span class="string">Failed to build directory listings!"</span>);
<span class="keyword">return</span>;
}</pre>
<div class="contentWrapper"><h1>Another test title</h1><div class="expandedContent" id="content_out\articles\test articles\test2.article">
<div class="contentWrapper"><h1>Another test title</h1><div class="expandedContent" id="content_out/articles/test articles/test2.article">
<p> Sed lobortis nisi id nunc tincidunt volutpat. Mauris cursus felis quis condimentum posuere. Pellentesque vitae dolor et justo suscipit ultrices. Integer dapibus leo id felis varius, ut volutpat massa bibendum. Quisque sed nunc arcu. In sit amet faucibus magna, non venenatis massa. Cras sed placerat risus, id consectetur est. Pellentesque in nunc dolor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Quisque eget lorem ac urna posuere accumsan. Quisque sed imperdiet nisi.</p>
</div><div class="datebar"></div><div class="date">1 May 2022 05:13AM</div></div>

@ -1,3 +1,3 @@
<div class="contentWrapper"><h1>And More</h1><div class="content" id="content_out\articles\test articles\test3.article">
<div class="contentWrapper"><h1>And More</h1><div class="content" id="content_out/articles/test articles/test3.article">
<p> Curabitur suscipit quam tellus, non rhoncus diam vehicula in. Aliquam ut dapibus tortor. Cras accumsan arcu vel ante maximus ornare. Nam tempus fermentum leo maximus euismod. Donec vehicula pretium est a ultrices. Nunc blandit nibh lorem, nec blandit leo posuere quis. Sed mauris ligula, euismod eu aliquam vel, rhoncus eget magna. Proin eget tortor ut ligula suscipit mattis. Integer rutrum aliquet eleifend. Suspendisse leo libero, placerat nec mi id, sagittis malesuada felis. Quisque euismod ante cursus elit lobortis, eu tempus ligula condimentum. Mauris viverra metus et dignissim efficitur. Ut placerat nunc nunc, eu tempus neque ultrices nec. Suspendisse et magna risus. Phasellus in ullamcorper tortor. Sed lobortis ut mi in blandit.</p>
</div><div class="datebar"></div><div class="date">30 Apr 2022 6:14PM</div>%CONDITIONAL_EXPAND%</div>

@ -30,7 +30,7 @@ bunch of random Java code.
<span class="variable">System</span>.<span class="variable">err</span>.<span class="function">println</span>(<span class="string">Failed to build directory listings!"</span>);
<span class="keyword">return</span>;
}</pre>
<div class="contentWrapper"><h1>And More</h1><div class="expandedContent" id="content_out\articles\test articles\test3.article">
<div class="contentWrapper"><h1>And More</h1><div class="expandedContent" id="content_out/articles/test articles/test3.article">
<p> Curabitur suscipit quam tellus, non rhoncus diam vehicula in. Aliquam ut dapibus tortor. Cras accumsan arcu vel ante maximus ornare. Nam tempus fermentum leo maximus euismod. Donec vehicula pretium est a ultrices. Nunc blandit nibh lorem, nec blandit leo posuere quis. Sed mauris ligula, euismod eu aliquam vel, rhoncus eget magna. Proin eget tortor ut ligula suscipit mattis. Integer rutrum aliquet eleifend. Suspendisse leo libero, placerat nec mi id, sagittis malesuada felis. Quisque euismod ante cursus elit lobortis, eu tempus ligula condimentum. Mauris viverra metus et dignissim efficitur. Ut placerat nunc nunc, eu tempus neque ultrices nec. Suspendisse et magna risus. Phasellus in ullamcorper tortor. Sed lobortis ut mi in blandit.</p>
</div><div class="datebar"></div><div class="date">30 Apr 2022 6:14PM</div></div>

@ -4,13 +4,14 @@
while (true) {
try (Socket client = socket.accept()) {
System.out.println("New client connection detected: "+client.toString());
BufferedReader in = new BufferedReader(new InputStreamReader(client.getInputStream()));
BufferedReader in = new BufferedReader(new InputStreamReader(client.getInputStream(),"ISO-8859-1"));
String requestLine,line;
ZonedDateTime modifiedDate = null;
String boundary=null;
boolean uploadData = false;
boolean truncateUntilBoundary=false;
String filename=null;
OutputStream stream = null;
boolean firstLine=true;
requestLine=in.readLine(); //Read the first line, this should be our request.
if (requestLine!=null) {
String[] splitter = requestLine.split(Pattern.quote(" "));
@ -18,7 +19,6 @@
if (splitter.length==3) {
while (in.ready()) {
line=in.readLine();
if (ISPOST) {
if (boundary!=null) {
if (!truncateUntilBoundary) {
@ -30,11 +30,11 @@
}
}
} else
if (line.contains(boundary)) {
System.out.println("");
System.out.println("<...>");
System.out.println("");
if (line.contains("Content-Disposition: ")||line.contains("Content-Type: ")) {
if (line.contains("filename=")) {
filename=line.substring(line.indexOf("filename=")+"filename=".length()+1);
filename = filename.substring(0,filename.length()-1);
} else {
System.out.println(line);
truncateUntilBoundary=false;
}
} else {

@ -39,7 +39,7 @@ This is a different webpage.<hr>
modify.remove();
}
</script>
<div class="contentWrapper"><h1>Welcome to SigPlace!</h1><div class="content" id="content_out\articles\sigplace1.article">
<div class="contentWrapper"><h1>Welcome to SigPlace!</h1><div class="content" id="content_out/articles/sigplace1.article">
<p> This is a SigPlace article! It will contain information that is important (probably) and will be layed out as such.</p>
<p> Paragraphs are automatically split up for readability and generated correctly via the parser. There's quite a bit of flexibility with the system and makes it easy to post updates should they be required.</p>
<p> A lot of content management systems would do this by having a web interface and submitting content and managing it that way, but by coding my own management system and using the built-in OS' filesystem to handle the work, I save myself a lot of pains and headaches.</p>
@ -52,19 +52,19 @@ This is a different webpage.<hr>
<p>Nunc tortor sem, dapibus mattis varius id, varius eu leo. Phasellus efficitur nulla a diam faucibus, id facilisis lacus malesuada. Nulla condimentum egestas erat a fermentum. Ut interdum dui id est condimentum, vel fermentum nisi ornare. Sed eu rhoncus magna, sit amet finibus eros. In a nibh tincidunt, suscipit tellus eleifend, faucibus mauris. Vestibulum sagittis nisi et efficitur ullamcorper. Donec sodales efficitur ligula id congue. Etiam egestas tristique interdum. Mauris at massa eget metus pellentesque fermentum nec non lacus. Nulla turpis nunc, feugiat vel euismod ac, maximus id est. Praesent cursus elit ac dolor hendrerit lacinia.</p>
<br/>
<p>Vestibulum laoreet lorem consequat, mollis augue finibus, luctus libero. Praesent convallis sed velit vitae molestie. Vestibulum nec fringilla tellus, non dictum nulla. Donec tempor ac diam sit amet porta. Quisque mi ex, vulputate ac tincidunt vel, vestibulum vitae orci. Duis gravida mauris eget mauris pulvinar, lobortis tincidunt neque efficitur. Nunc blandit metus vitae faucibus vulputate. Curabitur rhoncus volutpat lorem, sit amet pulvinar ipsum. Fusce ultricies enim odio, a viverra quam tincidunt quis. Aliquam sollicitudin a sapien id efficitur. Proin at finibus elit, id gravida elit. Nulla facilisi. Ut tincidunt, ligula eu pulvinar dapibus, lorem nisl facilisis tellus, in ornare quam dolor quis libero. Pellentesque ut convallis orci. Donec volutpat nunc velit, tristique convallis purus lacinia sit amet. Maecenas porttitor cursus nisl sed porta.</p>
</div><div class="datebar"></div><div class="date">3 May 2022 10:25AM</div><div class="unexpanded" id="expand_33" onClick="expand(this,'out\articles\sigplace1.article')"><br/><br/><br/><br/>&#x2908; Click to expand.</div></div>
<div class="contentWrapper"><h1>A Test Title</h1><div class="content" id="content_out\articles\test articles\test1.article">
</div><div class="datebar"></div><div class="date">3 May 2022 10:25AM</div><div class="unexpanded" id="expand_33" onClick="expand(this,'out/articles/sigplace1.article')"><br/><br/><br/><br/>&#x2908; Click to expand.</div></div>
<div class="contentWrapper"><h1>A Test Title</h1><div class="content" id="content_out/articles/test articles/test1.article">
<p> In dolor erat, malesuada at elit cursus, convallis imperdiet turpis. Ut aliquet magna tellus, at viverra mauris ullamcorper vehicula. Nam quis urna semper magna ornare elementum sed id mauris. Suspendisse faucibus nunc ante, ac rhoncus nisl tristique sed. Vestibulum pretium odio eget scelerisque vestibulum. Aliquam viverra ex ac vestibulum interdum. Donec ligula nunc, dignissim a purus vitae, fermentum laoreet diam. Quisque nec auctor urna. Vestibulum sit amet ligula ullamcorper, congue ipsum et, accumsan ante. Phasellus fermentum, sapien nec pulvinar blandit, elit purus pretium urna, et dapibus orci urna eu metus. Nunc molestie dictum pharetra. Suspendisse luctus felis et ante tristique, vitae commodo diam porttitor. Aliquam orci eros, placerat ac justo vitae, bibendum efficitur metus. Phasellus eget bibendum mauris.</p>
</div><div class="datebar"></div><div class="date">2 May 2022 10:16AM</div><div class="unexpanded" id="expand_55" onClick="expand(this,'out\articles\test articles\test1.article')"><br/><br/><br/><br/>&#x2908; Click to expand.</div></div>
<div class="contentWrapper"><h1>Another test title</h1><div class="content" id="content_out\articles\test articles\test2.article">
</div><div class="datebar"></div><div class="date">2 May 2022 10:16AM</div><div class="unexpanded" id="expand_55" onClick="expand(this,'out/articles/test articles/test1.article')"><br/><br/><br/><br/>&#x2908; Click to expand.</div></div>
<div class="contentWrapper"><h1>Another test title</h1><div class="content" id="content_out/articles/test articles/test2.article">
<p> Sed lobortis nisi id nunc tincidunt volutpat. Mauris cursus felis quis condimentum posuere. Pellentesque vitae dolor et justo suscipit ultrices. Integer dapibus leo id felis varius, ut volutpat massa bibendum. Quisque sed nunc arcu. In sit amet faucibus magna, non venenatis massa. Cras sed placerat risus, id consectetur est. Pellentesque in nunc dolor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Quisque eget lorem ac urna posuere accumsan. Quisque sed imperdiet nisi.</p>
</div><div class="datebar"></div><div class="date">1 May 2022 05:13AM</div><div class="unexpanded" id="expand_58" onClick="expand(this,'out\articles\test articles\test2.article')"><br/><br/><br/><br/>&#x2908; Click to expand.</div></div>
<div class="contentWrapper"><h1>And More</h1><div class="content" id="content_out\articles\test articles\test3.article">
</div><div class="datebar"></div><div class="date">1 May 2022 05:13AM</div><div class="unexpanded" id="expand_58" onClick="expand(this,'out/articles/test articles/test2.article')"><br/><br/><br/><br/>&#x2908; Click to expand.</div></div>
<div class="contentWrapper"><h1>And More</h1><div class="content" id="content_out/articles/test articles/test3.article">
<p> Curabitur suscipit quam tellus, non rhoncus diam vehicula in. Aliquam ut dapibus tortor. Cras accumsan arcu vel ante maximus ornare. Nam tempus fermentum leo maximus euismod. Donec vehicula pretium est a ultrices. Nunc blandit nibh lorem, nec blandit leo posuere quis. Sed mauris ligula, euismod eu aliquam vel, rhoncus eget magna. Proin eget tortor ut ligula suscipit mattis. Integer rutrum aliquet eleifend. Suspendisse leo libero, placerat nec mi id, sagittis malesuada felis. Quisque euismod ante cursus elit lobortis, eu tempus ligula condimentum. Mauris viverra metus et dignissim efficitur. Ut placerat nunc nunc, eu tempus neque ultrices nec. Suspendisse et magna risus. Phasellus in ullamcorper tortor. Sed lobortis ut mi in blandit.</p>
</div><div class="datebar"></div><div class="date">30 Apr 2022 6:14PM</div><div class="unexpanded" id="expand_61" onClick="expand(this,'out\articles\test articles\test3.article')"><br/><br/><br/><br/>&#x2908; Click to expand.</div></div>
<div class="contentWrapper"><h1>Curabitur vel tempus ex</h1><div class="content" id="content_out\articles\curabitur vel tempus ex.article">
</div><div class="datebar"></div><div class="date">30 Apr 2022 6:14PM</div><div class="unexpanded" id="expand_61" onClick="expand(this,'out/articles/test articles/test3.article')"><br/><br/><br/><br/>&#x2908; Click to expand.</div></div>
<div class="contentWrapper"><h1>Curabitur vel tempus ex</h1><div class="content" id="content_out/articles/curabitur vel tempus ex.article">
<p>Curabitur vel tempus ex. Duis cursus sapien nisl, ut pulvinar dui porttitor ut. Nullam odio purus, tristique non turpis sit amet, malesuada ultricies purus. Mauris ut nulla nisl. Aenean sit amet est egestas justo volutpat consequat. Suspendisse in sagittis augue, et mattis tortor. Nullam viverra metus et nibh fringilla iaculis.</p>
</div><div class="datebar"></div><div class="date">29 Apr 2022 7:37PM</div><div class="unexpanded" id="expand_64" onClick="expand(this,'out\articles\curabitur vel tempus ex.article')"><br/><br/><br/><br/>&#x2908; Click to expand.</div></div>
</div><div class="datebar"></div><div class="date">29 Apr 2022 7:37PM</div><div class="unexpanded" id="expand_64" onClick="expand(this,'out/articles/curabitur vel tempus ex.article')"><br/><br/><br/><br/>&#x2908; Click to expand.</div></div>
</div> <!--End Content Body-->
<div class="codeForeground" id="codeForeground"></div>

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

@ -9,6 +9,7 @@ import java.net.Socket;
import java.net.SocketException;
import java.net.URLDecoder;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.charset.UnmappableCharacterException;
@ -37,13 +38,14 @@ public class sigServer {
while (true) {
try (Socket client = socket.accept()) {
System.out.println("New client connection detected: "+client.toString());
BufferedReader in = new BufferedReader(new InputStreamReader(client.getInputStream()));
BufferedReader in = new BufferedReader(new InputStreamReader(client.getInputStream(),"ISO-8859-1"));
String requestLine,line;
ZonedDateTime modifiedDate = null;
String boundary=null;
boolean uploadData = false;
boolean truncateUntilBoundary=false;
String filename=null;
OutputStream stream = null;
boolean firstLine=true;
requestLine=in.readLine(); //Read the first line, this should be our request.
if (requestLine!=null) {
String[] splitter = requestLine.split(Pattern.quote(" "));
@ -62,17 +64,6 @@ public class sigServer {
}
}
} else
if (line.contains(boundary)) {
System.out.println("");
System.out.println("<...>");
System.out.println("");
System.out.println(line);
truncateUntilBoundary=false;
filename=null;
uploadData=false;
System.out.println("Saving upload to "+sigPlace.UPLOADSDIR+" directory.");
} else
if (line.contains("Content-Disposition: ")||line.contains("Content-Type: ")) {
if (line.contains("filename=")) {
filename=line.substring(line.indexOf("filename=")+"filename=".length()+1);
@ -81,17 +72,36 @@ public class sigServer {
System.out.println(line);
}
} else {
OutputStream stream = null;
byte[] byteContent = new String(line.getBytes(),StandardCharsets.UTF_8).getBytes(StandardCharsets.UTF_8);
File myFile = new File(new File(sigPlace.OUTDIR,sigPlace.UPLOADSDIR),filename);
// check if file exist, otherwise create the file before writing
if (!myFile.exists()) {
myFile.createNewFile();
} else {
myFile.delete();
myFile.createNewFile();
}
stream = new FileOutputStream(myFile);
stream.write(byteContent);
stream.flush();
char[] buffer = new char[1024];
int count;
while ((count = in.read(buffer))>0) {
//stream.write(in.read(buffer));
//stream.write(buffer.,0,count);
String buf = new String(buffer);
byte[] data = buf.getBytes("ISO-8859-1");
stream.write(data,0,count);
if (buf.contains(boundary)) {
System.out.println("");
System.out.println("<...>");
System.out.println("");
System.out.println(new String(data,StandardCharsets.UTF_8));
break;
}
}
stream.close();
filename=null;
firstLine=true;
System.out.println("Saving upload to "+sigPlace.UPLOADSDIR+" directory.");
}
}
if (line.contains("Content-Type: multipart/form-data; boundary=")) {

@ -0,0 +1 @@
!<EFBFBD>BH` !<EFBFBD>BH` !<EFBFBD>BH` !<EFBFBD>B ,!<EFBFBD>B ,!<EFBFBD>B ,!<EFBFBD>B!<EFBFBD>%<EFBFBD>BQ <EFBFBD>o
Loading…
Cancel
Save