Michael Peter Christen
8 years ago
commit
335868edba
@ -1,3 +1,3 @@
|
||||
#!/usr/bin/env sh
|
||||
cd "`dirname $0`"
|
||||
./apicall.sh /IndexImportMediawiki_p.html?file=$1 > /dev/null
|
||||
./protectedPostApiCall.sh "IndexImportMediawiki_p.html" "file=$1"
|
||||
|
||||
@ -0,0 +1,29 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<title>YaCy '#[clientname]#': User Accounts</title>
|
||||
#%env/templates/metas.template%#
|
||||
<script type="text/javascript" src="js/sorttable.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
#%env/templates/header.template%#
|
||||
#%env/templates/submenuUseCaseAccount.template%#
|
||||
<h2>User List</h2>
|
||||
|
||||
<fieldset><legend>User Accounts</legend>
|
||||
<table class="sortable">
|
||||
<tr class="TableHeader">
|
||||
<th>User</th><th>First name</th><th>Last name</th><th>Address</th><th>Last Access</th><th>Rights</th><th>Time</th><th>Traffic</th>
|
||||
</tr>
|
||||
#{userlist}#
|
||||
<tr>
|
||||
<td><a href="ConfigUser_p.html?user=#[username]#">#[username]#</a></td><td>#[firstname]#</td><td>#[lastname]#</td><td>#[address]#</td><td>#[lastaccess]#</td><td>#[rights]#</td><td>#[time]#</td><td>#[traffic]#</td>
|
||||
</tr>
|
||||
#{/userlist}#
|
||||
</table>
|
||||
|
||||
</fieldset>
|
||||
|
||||
#%env/templates/footer.template%#
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,103 @@
|
||||
// ConfigAccountList_p.java
|
||||
// -------------------------
|
||||
// (c) 2017 by reger24; https://github.com/reger24
|
||||
//
|
||||
// This is a part of YaCy, a peer-to-peer based web search engine
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.Iterator;
|
||||
import net.yacy.cora.date.GenericFormatter;
|
||||
import net.yacy.cora.protocol.RequestHeader;
|
||||
import net.yacy.data.UserDB;
|
||||
import net.yacy.data.UserDB.AccessRight;
|
||||
import net.yacy.search.Switchboard;
|
||||
import net.yacy.server.serverObjects;
|
||||
import net.yacy.server.serverSwitch;
|
||||
|
||||
public class ConfigAccountList_p {
|
||||
|
||||
public static serverObjects respond(@SuppressWarnings("unused") final RequestHeader header, final serverObjects post, final serverSwitch env) {
|
||||
|
||||
final serverObjects prop = new serverObjects();
|
||||
final Switchboard sb = (Switchboard) env;
|
||||
UserDB.Entry entry;
|
||||
|
||||
if (sb.userDB == null) {
|
||||
prop.put("userlist", 0);
|
||||
return prop;
|
||||
}
|
||||
|
||||
//Generate Userlist
|
||||
final Iterator<UserDB.Entry> it = sb.userDB.iterator(true);
|
||||
int numUsers = 0;
|
||||
while (it.hasNext()) {
|
||||
entry = it.next();
|
||||
if (entry == null) {
|
||||
continue;
|
||||
}
|
||||
prop.putHTML("userlist_" + numUsers + "_username", entry.getUserName());
|
||||
prop.putHTML("userlist_" + numUsers + "_lastname", entry.getLastName());
|
||||
prop.putHTML("userlist_" + numUsers + "_firstname", entry.getFirstName());
|
||||
prop.putHTML("userlist_" + numUsers + "_address", entry.getAddress());
|
||||
if (entry.getLastAccess() != null) {
|
||||
prop.put("userlist_" + numUsers + "_lastaccess", GenericFormatter.FORMAT_SIMPLE.format(new Date(entry.getLastAccess())));
|
||||
} else {
|
||||
prop.put("userlist_" + numUsers + "_lastaccess", "never");
|
||||
}
|
||||
|
||||
final AccessRight[] rights = AccessRight.values();
|
||||
String rightStr = "";
|
||||
for (final AccessRight right : rights) {
|
||||
if (entry.hasRight(right)) {
|
||||
if (rightStr.isEmpty()) {
|
||||
rightStr = right.getFriendlyName();
|
||||
} else {
|
||||
rightStr += ", " + right.getFriendlyName();
|
||||
}
|
||||
}
|
||||
}
|
||||
prop.putHTML("userlist_" + numUsers + "_rights", rightStr);
|
||||
|
||||
long percent;
|
||||
if (entry.getTrafficLimit() != null) {
|
||||
long limit = entry.getTrafficLimit();
|
||||
long used = entry.getTrafficSize();
|
||||
percent = used * 100 / limit;
|
||||
prop.put("userlist_" + numUsers + "_time", percent);
|
||||
} else {
|
||||
prop.put("userlist_" + numUsers + "_time", "");
|
||||
}
|
||||
|
||||
percent = -1;
|
||||
if (entry.getTimeLimit() > 0) {
|
||||
long limit = entry.getTimeLimit();
|
||||
long used = entry.getTimeUsed();
|
||||
percent = used * 100 / limit;
|
||||
prop.put("userlist_" + numUsers + "_traffic", percent);
|
||||
} else {
|
||||
prop.put("userlist_" + numUsers + "_traffic", "");
|
||||
}
|
||||
|
||||
|
||||
numUsers++;
|
||||
}
|
||||
prop.put("userlist", numUsers);
|
||||
|
||||
// return rewrite properties
|
||||
return prop;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,67 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<title>YaCy '#[clientname]#': User Editor</title>
|
||||
#%env/templates/metas.template%#
|
||||
</head>
|
||||
<body>
|
||||
#%env/templates/header.template%#
|
||||
#%env/templates/submenuUseCaseAccount.template%#
|
||||
<h2>User Account Editor</h2>
|
||||
|
||||
<!-- Page 1: Results -->
|
||||
#(text)#
|
||||
::
|
||||
<p>User created: #[username]#</p>
|
||||
::
|
||||
<p>User changed: #[username]#</p>
|
||||
#(/text)#
|
||||
#(error)#
|
||||
::
|
||||
<p class="error">Generic error.</p>
|
||||
::
|
||||
<p class="error">Passwords do not match.</p>
|
||||
::
|
||||
<p class="error">Username too short. Username must be >= 4 Characters.</p>
|
||||
::
|
||||
<p class="error">Username already used (not allowed).</p>
|
||||
#(/error)#
|
||||
|
||||
<form action="ConfigUser_p.html" method="post" accept-charset="UTF-8">
|
||||
<fieldset><legend>Edit current user: #[username]#</legend>
|
||||
<!-- Hidden(text for debugging): <input type="text" name="current_user" value="#[current_user]#" readonly> -->
|
||||
<input type="hidden" name="current_user" value="#[current_user]#" />
|
||||
<dl>
|
||||
<dt><label for="username">Username</label>:</dt>
|
||||
<dd><input type="text" id="username" name="username" value="#[username]#" /></dd>
|
||||
<dt><label for="password">Password</label>:</dt>
|
||||
<dd><input type="password" id="password" name="password" /></dd>
|
||||
<dt><label for="password2">Repeat password</label>:</dt>
|
||||
<dd><input type="password" id="password2" name="password2" /></dd>
|
||||
<dt><label for="firstname">First name</label>:</dt>
|
||||
<dd><input type="text" id="firstname" name="firstname" value="#[firstname]#" /></dd>
|
||||
<dt><label for="lastname">Last name</label>:</dt>
|
||||
<dd><input type="text" id="lastname" name="lastname" value="#[lastname]#" /></dd>
|
||||
<dt><label for="address">Address</label>:</dt>
|
||||
<dd><input type="text" id="address" name="address" value="#[address]#" /></dd>
|
||||
<dt>Rights:</dt>
|
||||
<dd>
|
||||
#{rights}#
|
||||
<input type="checkbox" id="#[name]#" name="#[name]#"#(set)#:: checked="checked"#(/set)# /><label for="#[name]#">#[friendlyName]# right</label><br />
|
||||
#{/rights}#
|
||||
</dd>
|
||||
<dt><label for="tlimit">Timelimit</label>:</dt>
|
||||
<dd><input type="text" id="tlimit" name="timelimit" value="#[timelimit]#" /></dd>
|
||||
<dt><label for="tused">Time used</label>:</dt>
|
||||
<dd><input type="text" id="tused" name="timeused" value="#[timeused]#" /></dd>
|
||||
<dt> </dt>
|
||||
<dd><input type="submit" name="change" value="Save User" class="btn btn-primary"/>
|
||||
<input type="submit" name="delete" value="Delete User" class="btn btn-danger"/>
|
||||
<button name="cancel" class="btn btn-default btn-link" value="ConfigAccountList_p.html">back to user list</button></dd>
|
||||
</dl>
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
#%env/templates/footer.template%#
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,172 @@
|
||||
// ConfigUser_p.java
|
||||
// -----------------------
|
||||
// (c) 2017 by reger24; https://github.com/reger24
|
||||
//
|
||||
// This is a part of YaCy, a peer-to-peer based web search engine
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
import java.util.EnumMap;
|
||||
import java.util.Map;
|
||||
import net.yacy.cora.order.Digest;
|
||||
import net.yacy.cora.protocol.RequestHeader;
|
||||
import net.yacy.cora.util.ConcurrentLog;
|
||||
import net.yacy.data.UserDB;
|
||||
import net.yacy.data.UserDB.AccessRight;
|
||||
import net.yacy.search.Switchboard;
|
||||
import net.yacy.search.SwitchboardConstants;
|
||||
import net.yacy.server.serverObjects;
|
||||
import net.yacy.server.serverSwitch;
|
||||
|
||||
public class ConfigUser_p {
|
||||
|
||||
public static serverObjects respond(@SuppressWarnings("unused") final RequestHeader header, final serverObjects post, final serverSwitch env) {
|
||||
|
||||
final serverObjects prop = new serverObjects();
|
||||
final Switchboard sb = (Switchboard) env;
|
||||
|
||||
if (post != null && post.containsKey("cancel")) {
|
||||
prop.put(serverObjects.ACTION_LOCATION, "ConfigAccountList_p.html");
|
||||
return prop;
|
||||
}
|
||||
|
||||
//default values
|
||||
prop.put("current_user", "newuser");
|
||||
prop.put("username", "");
|
||||
prop.put("firstname", "");
|
||||
prop.put("lastname", "");
|
||||
prop.put("address", "");
|
||||
prop.put("timelimit", "");
|
||||
prop.put("timeused", "");
|
||||
|
||||
final AccessRight[] rights = AccessRight.values();
|
||||
int c = 0;
|
||||
for (final AccessRight right : rights) {
|
||||
prop.put("rights_" + c + "_name", right.toString());
|
||||
prop.put("rights_" + c + "_friendlyName", right.getFriendlyName());
|
||||
prop.put("rights_" + c + "_set", "0");
|
||||
c++;
|
||||
}
|
||||
prop.put("rights", c);
|
||||
|
||||
prop.put("users", "0");
|
||||
|
||||
if (sb.userDB == null) {
|
||||
return prop;
|
||||
}
|
||||
|
||||
if (post == null) {
|
||||
//do nothing
|
||||
} else if (post.containsKey("user") && !"newuser".equals(post.get("user"))) {
|
||||
|
||||
UserDB.Entry entry = sb.userDB.getEntry(post.get("user"));
|
||||
if (entry != null) {
|
||||
//TODO: set username read-only in html
|
||||
prop.putHTML("current_user", entry.getUserName());
|
||||
prop.putHTML("username", entry.getUserName());
|
||||
prop.putHTML("firstname", entry.getFirstName());
|
||||
prop.putHTML("lastname", entry.getLastName());
|
||||
prop.putHTML("address", entry.getAddress());
|
||||
prop.put("timelimit", entry.getTimeLimit());
|
||||
prop.put("timeused", entry.getTimeUsed());
|
||||
int count = 0;
|
||||
for (final AccessRight right : rights) {
|
||||
prop.put("rights_" + count + "_set", entry.hasRight(right) ? "1" : "0");
|
||||
count++;
|
||||
}
|
||||
prop.put("rights", count);
|
||||
}
|
||||
} else if (post.containsKey("change")) { // edit User
|
||||
prop.put("text", "0");
|
||||
prop.put("error", "0");
|
||||
|
||||
final String username = post.get("username");
|
||||
final String pw1 = post.get("password");
|
||||
final String pw2 = post.get("password2");
|
||||
|
||||
if (pw1 == null || !pw1.equals(pw2)) {
|
||||
prop.put("error", "2"); //PW does not match
|
||||
return prop;
|
||||
}
|
||||
// do not allow same username as staticadmin
|
||||
if (username.equalsIgnoreCase(sb.getConfig(SwitchboardConstants.ADMIN_ACCOUNT_USER_NAME, "admin"))) {
|
||||
prop.put("error", "4");
|
||||
return prop;
|
||||
}
|
||||
final String firstName = post.get("firstname");
|
||||
final String lastName = post.get("lastname");
|
||||
final String address = post.get("address");
|
||||
final String timeLimit = post.get("timelimit");
|
||||
final String timeUsed = post.get("timeused");
|
||||
final Map<AccessRight, String> rightsSet = new EnumMap<AccessRight, String>(AccessRight.class);
|
||||
|
||||
for (final AccessRight right : rights) {
|
||||
rightsSet.put(right, post.containsKey(right.toString()) && "on".equals(post.get(right.toString())) ? "true" : "false");
|
||||
}
|
||||
|
||||
UserDB.Entry entry = sb.userDB.getEntry(username);
|
||||
|
||||
if (entry != null) {
|
||||
try {
|
||||
if (!"".equals(pw1)) {
|
||||
// with prefix of encoding method (supported MD5: )
|
||||
entry.setProperty(UserDB.Entry.MD5ENCODED_USERPWD_STRING, "MD5:" + Digest.encodeMD5Hex(username + ":" + sb.getConfig(SwitchboardConstants.ADMIN_REALM, "YaCy") + ":" + pw1));
|
||||
}
|
||||
|
||||
entry.setProperty(UserDB.Entry.USER_FIRSTNAME, firstName);
|
||||
entry.setProperty(UserDB.Entry.USER_LASTNAME, lastName);
|
||||
entry.setProperty(UserDB.Entry.USER_ADDRESS, address);
|
||||
entry.setProperty(UserDB.Entry.TIME_LIMIT, timeLimit);
|
||||
entry.setProperty(UserDB.Entry.TIME_USED, timeUsed);
|
||||
|
||||
for (final AccessRight right : rights) {
|
||||
entry.setProperty(right.toString(), rightsSet.get(right));
|
||||
}
|
||||
|
||||
//TODO: set username read-only in html
|
||||
prop.putHTML("current_user", entry.getUserName());
|
||||
prop.putHTML("username", entry.getUserName());
|
||||
prop.putHTML("firstname", entry.getFirstName());
|
||||
prop.putHTML("lastname", entry.getLastName());
|
||||
prop.putHTML("address", entry.getAddress());
|
||||
prop.put("timelimit", entry.getTimeLimit());
|
||||
prop.put("timeused", entry.getTimeUsed());
|
||||
int count = 0;
|
||||
for (final AccessRight right : rights) {
|
||||
prop.put("rights_" + count + "_set", entry.hasRight(right) ? "1" : "0");
|
||||
count++;
|
||||
}
|
||||
prop.put("rights", count);
|
||||
|
||||
} catch (final Exception e) {
|
||||
ConcurrentLog.logException(e);
|
||||
}
|
||||
|
||||
} else {
|
||||
prop.put("error", "1");
|
||||
}
|
||||
prop.putHTML("text_username", username);
|
||||
prop.put("text", "2");
|
||||
|
||||
prop.putHTML("username", username);
|
||||
} else if (post.containsKey("delete")) {
|
||||
sb.userDB.removeEntry(post.get("username"));
|
||||
prop.put(serverObjects.ACTION_LOCATION, "ConfigAccountList_p.html"); // jump back to user list
|
||||
}
|
||||
|
||||
// return rewrite properties
|
||||
return prop;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in new issue