boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

rightsmanagement for upload/download User - preparations for proxy and admin User

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@957 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
allo 20 years ago
parent 2dfd6bf36a
commit df147d0fb0
3 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File

9
htroot/User_p.html
Unescape View File

@ -55,6 +55,15 @@ Current User: #[username]#
<td>Address: </td>
<td><input type="text" name="address" value="#[address]#"></td>
</tr>
<tr>
<td>Rights</td>
<td>
<input type="checkbox" name="proxyRight" checked disabled>Proxy<br />
<input type="checkbox" name="adminRight" disabled>Admin<br />
<input type="checkbox" name="uploadRight" #(uploadRight)#::checked#(/uploadRight)#>Fileshare-Upload<br />
<input type="checkbox" name="downloadRight" #(downloadRight)#::checked#(/downloadRight)#>Fileshare-Download<br />
</td>
</tr>
<tr>
<td>Timelimit: </td>
<td><input type="text" name="timelimit" value="#[timelimit]#"></td>

57
htroot/User_p.java
Unescape View File

@ -77,6 +77,9 @@ public class User_p {
prop.put("page_timelimit", "");
prop.put("page_timeused", "");
prop.put("page_timerange", "");
prop.put("page_downloadRight", 0);
prop.put("page_uploadRight", 0);
prop.put("page_users", 0);
if(sb.userDB == null)
@ -100,37 +103,33 @@ public class User_p {
prop.put("page_address", entry.getAddress());
prop.put("page_timelimit", entry.getTimeLimit());
prop.put("page_timeused", entry.getTimeUsed());
prop.put("page_uploadRight", (entry.hasUploadRight()?1:0));
prop.put("page_downloadRight", (entry.hasDownloadRight()?1:0));
}else if( post.containsKey("delete_user") && !((String)post.get("user")).equals("newuser") ){
sb.userDB.removeEntry((String)post.get("user"));
}
} else if(post.containsKey("change")) { //New User
} else if(post.containsKey("change")) { //New User / edit User
prop.put("page", 1); //results
prop.put("page_text", 0);
prop.put("page_error", 0);
String username="";
String pw="";
String pw2="";
String firstName="";
String lastName="";
String address="";
String timeLimit="0";
String timeUsed="0";
String username=(String)post.get("username");
String pw=(String)post.get("password");
String pw2=(String)post.get("password2");
if(! pw.equals(pw2)){
prop.put("page_error", 2); //PW does not match
return prop;
}
String firstName=(String)post.get("firstname");
String lastName=(String)post.get("lastname");
String address=(String)post.get("address");
String timeLimit=(String)post.get("timelimit");
String timeUsed=(String)post.get("timeused");
String uploadRight=( post.containsKey("uploadRight")&&((String)post.get("uploadRight")).equals("on") ? "true" : "false");
String downloadRight=( post.containsKey("downloadRight")&&((String)post.get("downloadRight")).equals("on") ? "true" : "false");
HashMap mem=new HashMap();
if( post.get("current_user").equals("newuser")){ //new user
username=(String)post.get("username");
pw=(String)post.get("password");
pw2=(String)post.get("password2");
if(! pw.equals(pw2)){
prop.put("page_error", 2); //PW does not match
return prop;
}
firstName=(String)post.get("firstname");
lastName=(String)post.get("lastname");
address=(String)post.get("address");
timeLimit=(String)post.get("timelimit");
timeUsed=(String)post.get("timeused");
if(!pw.equals("")){ //change only if set
mem.put(userDB.Entry.MD5ENCODED_USERPWD_STRING, serverCodings.encodeMD5Hex(username+":"+pw));
@ -140,6 +139,8 @@ public class User_p {
mem.put(userDB.Entry.USER_ADDRESS, address);
mem.put(userDB.Entry.TIME_LIMIT, timeLimit);
mem.put(userDB.Entry.TIME_USED, timeUsed);
mem.put(userDB.Entry.UPLOAD_RIGHT, uploadRight);
mem.put(userDB.Entry.DOWNLOAD_RIGHT, downloadRight);
entry=sb.userDB.createEntry(username, mem);
sb.userDB.addEntry(entry);
@ -147,18 +148,6 @@ public class User_p {
prop.put("page_text", 1);
} else { //edit user
username=(String)post.get("username");
pw=(String)post.get("password");
pw2=(String)post.get("password2");
if(! pw.equals(pw2)){
prop.put("page_error", 1); //PW does not match
return prop;
}
firstName=(String)post.get("firstname");
lastName=(String)post.get("lastname");
address=(String)post.get("address");
timeLimit=(String)post.get("timelimit");
timeUsed=(String)post.get("timeused");
entry = sb.userDB.getEntry(username);
if(entry != null){
@ -171,6 +160,8 @@ public class User_p {
entry.setProperty(userDB.Entry.USER_ADDRESS, address);
entry.setProperty(userDB.Entry.TIME_LIMIT, timeLimit);
entry.setProperty(userDB.Entry.TIME_USED, timeUsed);
entry.setProperty(userDB.Entry.UPLOAD_RIGHT, uploadRight);
entry.setProperty(userDB.Entry.DOWNLOAD_RIGHT, downloadRight);
}catch (IOException e){
}
}else{

16
source/de/anomic/data/userDB.java
Unescape View File

@ -212,6 +212,10 @@ public final class userDB {
public static final String TIME_LIMIT = "timeLimit";
public static final String TRAFFIC_SIZE = "trafficSize";
public static final String TRAFFIC_LIMIT = "trafficLimit";
public static final String UPLOAD_RIGHT = "uploadRight";
public static final String DOWNLOAD_RIGHT = "downloadRight";
public static final String ADMIN_RIGHT = "adminRight";
public static final String PROXY_RIGHT = "proxyRight";
// this is a simple record structure that hold all properties of a user
private Map mem;
@ -364,6 +368,18 @@ public final class userDB {
public String getProperty(String propName, String defaultValue) {
return (this.mem.containsKey(propName)?(String)this.mem.get(propName):defaultValue);
}
public boolean hasUploadRight() {
return (this.mem.containsKey(UPLOAD_RIGHT)?((String)this.mem.get(UPLOAD_RIGHT)).equals("true"):false);
}
public boolean hasDownloadRight() {
return (this.mem.containsKey(DOWNLOAD_RIGHT)?((String)this.mem.get(DOWNLOAD_RIGHT)).equals("true"):false);
}
public boolean hasProxyRight() {
return (this.mem.containsKey(PROXY_RIGHT)?((String)this.mem.get(PROXY_RIGHT)).equals("true"):false);
}
public boolean hasAdminRight() {
return (this.mem.containsKey(ADMIN_RIGHT)?((String)this.mem.get(ADMIN_RIGHT)).equals("true"):false);
}
public String toString() {
StringBuffer str = new StringBuffer();

Write Preview
Loading…
Cancel
Save