From 99740d89a4e79486c2416f6ae13f780bbcfab17f Mon Sep 17 00:00:00 2001 From: Antoni Sawicki Date: Sun, 2 Dec 2018 23:49:54 -0800 Subject: Added a license Apache 2.0 --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -- cgit v1.2.3 From ae31437f20e21687df42bc0b4fec2785d98de00d Mon Sep 17 00:00:00 2001 From: Antoni Sawicki Date: Sun, 2 Dec 2018 23:51:50 -0800 Subject: license update --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 750e0b6..5056b54 100644 --- a/README.md +++ b/README.md @@ -115,6 +115,7 @@ and `access-htauth=:rw:*` in wfm.cfg. ## Copyrights and Credits Copyright (c) 1994-2018 by Antoni Sawicki +Copyright (c) 2018 by Google LLC Copyright (c) 1996-2011 by Thomas Boutell and Boutell.Com, Inc. Copyright (c) 2002 by Aladdin Enterprises Copyright (c) 1999-2009 by Paul Johnston -- cgit v1.2.3 From 5742b81f67db190340f695a5f1a17da96b7c13c2 Mon Sep 17 00:00:00 2001 From: Antoni Sawicki Date: Sun, 2 Dec 2018 23:52:52 -0800 Subject: copyright fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5056b54..ab49520 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ and `access-htauth=:rw:*` in wfm.cfg. ## Copyrights and Credits Copyright (c) 1994-2018 by Antoni Sawicki -Copyright (c) 2018 by Google LLC +Copyright (c) 2018 by Google LLC Copyright (c) 1996-2011 by Thomas Boutell and Boutell.Com, Inc. Copyright (c) 2002 by Aladdin Enterprises Copyright (c) 1999-2009 by Paul Johnston -- cgit v1.2.3 From 8ccfbbb36d34a4abb9ac2bcd1b718cc56f0f71e7 Mon Sep 17 00:00:00 2001 From: Antoni Sawicki Date: Sun, 2 Dec 2018 23:56:00 -0800 Subject: hack to logoff htauth session --- dialogs.c | 3 ++- dir.c | 7 +++++++ wfm.c | 19 +++++++++++++++++-- wfm.h | 3 ++- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dialogs.c b/dialogs.c index dfae4a4..60d0374 100644 --- a/dialogs.c +++ b/dialogs.c @@ -278,6 +278,7 @@ void about(void) { #endif "User Agent: %s
\n" "JavaScript Level: %d
\n" + "Auth: %d
\n" "Change Control: %s (%s)
\n" " 

\n" " 

\n" @@ -297,7 +298,7 @@ void about(void) { "\n\n", rt.iconsurl, cfg.tagline, VERSION, __DATE__, __TIME__, __VERSION__, cgiServerSoftware, ut.sysname, ut.nodename, ut.release, ut.version, ut.machine, - NAME_MAX, PATH_MAX, cgiUserAgent, rt.js, + NAME_MAX, PATH_MAX, cgiUserAgent, rt.js, rt.auth_method, #ifdef WFMGIT "Git" #else diff --git a/dir.c b/dir.c index fed0ae9..7616fa7 100644 --- a/dir.c +++ b/dir.c @@ -203,6 +203,13 @@ void dirlist(void) { "" " \"Access\" %s\n", cgiScriptName, wp.virt_dirname_urlencoded, rt.iconsurl, access_string[rt.access_level], access_string[rt.access_level]); + else if(rt.auth_method==3) + fprintf(cgiOut, + "" + "\"Access\"" + " %s \"User\" %s \n", + cgiScriptName, rt.iconsurl, access_string[rt.access_level], access_string[rt.access_level], rt.iconsurl, rt.loggedinuser); + else fprintf(cgiOut, "\"Access\"" diff --git a/wfm.c b/wfm.c index 8064797..a2da6d9 100644 --- a/wfm.c +++ b/wfm.c @@ -140,8 +140,9 @@ void access_check(char *access_string) { rt.access_level=PERM_RO; else if(strcmp(type, "rw")==0) rt.access_level=PERM_RW; - } - + + rt.auth_method=AUTH_IP; + } } else if(sscanf(access_string, "access-md5pw=%2[^':']:%30[^':']:%63s", type, user, pass)==3) { cfg.users_defined=1; @@ -154,6 +155,7 @@ void access_check(char *access_string) { rt.access_level=PERM_RW; rt.access_as_user=1; + rt.auth_method=AUTH_MD5; strncpy(rt.loggedinuser, user, sizeof(rt.loggedinuser)); } } @@ -167,6 +169,7 @@ void access_check(char *access_string) { rt.access_level=PERM_RW; rt.access_as_user=1; + rt.auth_method=AUTH_HT; strncpy(rt.loggedinuser, getenv("REMOTE_USER"), sizeof(rt.loggedinuser)); } } @@ -478,6 +481,16 @@ void redirect(char *location, ...) { va_end(ap); cgiHeaderLocation(buff); + exit(0); +} + +// +// Log off user from HTAUTH session +// +void logoff() { + cgiHeaderStatus(401, "Unauthorized"); + fprintf(cgiOut, "You have been logged out."); + exit(0); } @@ -564,9 +577,11 @@ int cgiMain(void) { char ea[8]={0}; // early action - simple actions before cfg is read or access check performed (no authentication!) + // note that ea functions must exit() cgiFormStringNoNewlines("ea", ea, sizeof(ea)); if(strcmp(ea, "icon")==0) icon(); // if(strcmp(ea, "upstat")==0) upload_status(); + if(strcmp(ea, "logoff")==0) logoff(); // normal initialization tstart(); diff --git a/wfm.h b/wfm.h index 8af36d6..5c4f0de 100644 --- a/wfm.h +++ b/wfm.h @@ -101,6 +101,7 @@ struct runtime_struct { char loggedinuser[64]; int access_level; int access_as_user; + int auth_method; int js; } rt; @@ -110,7 +111,7 @@ struct timeval mt; enum { FALSE, TRUE }; enum { PERM_NO, PERM_RO, PERM_RW }; enum { CHANGE, DELETE, MOVE }; - +enum { AUTH_NONE, AUTH_IP, AUTH_MD5, AUTH_HT }; typedef struct asdir_ { char name[NAME_MAX]; -- cgit v1.2.3 From 09f7627ac34a92c4299b3bdd2cebd853f0d3b34e Mon Sep 17 00:00:00 2001 From: Antoni Sawicki Date: Sun, 2 Dec 2018 23:58:47 -0800 Subject: addded google copyright for compilance --- dialogs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dialogs.c b/dialogs.c index 60d0374..d65705a 100644 --- a/dialogs.c +++ b/dialogs.c @@ -262,6 +262,7 @@ void about(void) { #endif "URL Encoding routines by Fred Bulback
\n" "Copyright © 1994-2018 by Antoni Sawicki
\n" + "Copyright © 2018 by Google LLC
\n" "Copyright © 1996-2011 by Thomas Boutell and Boutell.Com, Inc.
\n" "Copyright © 2002 by Aladdin Enterprises
\n" "Copyright © 1999-2009 by Paul Johnston
\n" -- cgit v1.2.3