Menu
▾
▴
treebase-guts
|
From: <yo...@us...> - 2010-07-21 12:50:46
|
Revision: 740
http://treebase.svn.sourceforge.net/treebase/?rev=740&view=rev
Author: youjun
Date: 2010-07-21 12:50:40 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-20 15:12:46 UTC (rev 739)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 12:50:40 UTC (rev 740)
@@ -38,7 +38,7 @@
public String processMultiparts(MultiPart multiPart) {
String ip = httpRequest.getRemoteAddr();
- if(!AllowIP.isAllowIP(ip))return "not authorized";
+ if(!AllowIP.isAllowIP(ip))return "client " + ip + " is not authorized";
BodyPartEntity bpe = (BodyPartEntity) multiPart.getBodyParts().get(0).getEntity();
File unzipFold;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2010-07-21 13:18:52
|
Revision: 741
http://treebase.svn.sourceforge.net/treebase/?rev=741&view=rev
Author: youjun
Date: 2010-07-21 13:15:13 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
treebase request ip is always re-write to 127.0.0.1, ip based authentication will not work
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 12:50:40 UTC (rev 740)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 13:15:13 UTC (rev 741)
@@ -38,7 +38,7 @@
public String processMultiparts(MultiPart multiPart) {
String ip = httpRequest.getRemoteAddr();
- if(!AllowIP.isAllowIP(ip))return "client " + ip + " is not authorized";
+ //if(!AllowIP.isAllowIP(ip))return "client " + ip + " is not authorized";
BodyPartEntity bpe = (BodyPartEntity) multiPart.getBodyParts().get(0).getEntity();
File unzipFold;
@@ -92,7 +92,6 @@
private static final String yale2 = "130.132.27.212";
static boolean isAllowIP(String ip){
-
if (ip.compareTo(dryad1)==0) return true;
if (ip.compareTo(dryad2)==0) return true;
if (ip.compareTo(yale1)==0)return true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2010-07-21 13:45:55
|
Revision: 742
http://treebase.svn.sourceforge.net/treebase/?rev=742&view=rev
Author: youjun
Date: 2010-07-21 13:45:49 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 13:15:13 UTC (rev 741)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 13:45:49 UTC (rev 742)
@@ -11,6 +11,7 @@
import com.sun.jersey.multipart.*;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpUtils;
import javax.ws.rs.Consumes;
//import javax.ws.rs.POST;
import javax.ws.rs.PUT;
@@ -76,7 +77,7 @@
e.printStackTrace(new PrintWriter(sw));
return sw.getBuffer().toString();
}
- String[] baseURL=httpRequest.getRequestURL().toString().split("handshaking");
+ String[] baseURL=HttpUtils.getRequestURL(httpRequest).toString().split("handshaking");
String importURL= baseURL[0] + "login.jsp?importKey=" + systemTime;
return importURL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2010-07-21 14:06:14
|
Revision: 743
http://treebase.svn.sourceforge.net/treebase/?rev=743&view=rev
Author: youjun
Date: 2010-07-21 14:06:05 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
apache rewrite the request url to localhost the application path is not working
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 13:45:49 UTC (rev 742)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 14:06:05 UTC (rev 743)
@@ -11,7 +11,6 @@
import com.sun.jersey.multipart.*;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpUtils;
import javax.ws.rs.Consumes;
//import javax.ws.rs.POST;
import javax.ws.rs.PUT;
@@ -77,8 +76,8 @@
e.printStackTrace(new PrintWriter(sw));
return sw.getBuffer().toString();
}
- String[] baseURL=HttpUtils.getRequestURL(httpRequest).toString().split("handshaking");
- String importURL= baseURL[0] + "login.jsp?importKey=" + systemTime;
+ //String[] baseURL=httpRequest.getRequestURL().toString().split("handshaking");
+ String importURL= "BASEURL" + "/login.jsp?importKey=" + systemTime;
return importURL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2010-07-21 14:08:54
|
Revision: 744
http://treebase.svn.sourceforge.net/treebase/?rev=744&view=rev
Author: youjun
Date: 2010-07-21 14:08:46 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
add comment
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 14:06:05 UTC (rev 743)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 14:08:46 UTC (rev 744)
@@ -38,7 +38,8 @@
public String processMultiparts(MultiPart multiPart) {
String ip = httpRequest.getRemoteAddr();
- //if(!AllowIP.isAllowIP(ip))return "client " + ip + " is not authorized";
+ // apache server re-write the ip to 127.0.0.1
+ //if(!AllowIP.isAllowIP(ip))return "client " + ip + " is not authorized";
BodyPartEntity bpe = (BodyPartEntity) multiPart.getBodyParts().get(0).getEntity();
File unzipFold;
@@ -75,7 +76,9 @@
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw));
return sw.getBuffer().toString();
- }
+ }
+
+ // apache server re-write the application path to localhost
//String[] baseURL=httpRequest.getRequestURL().toString().split("handshaking");
String importURL= "BASEURL" + "/login.jsp?importKey=" + systemTime;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2010-07-22 14:03:26
|
Revision: 747
http://treebase.svn.sourceforge.net/treebase/?rev=747&view=rev
Author: youjun
Date: 2010-07-22 14:03:19 +0000 (Thu, 22 Jul 2010)
Log Message:
-----------
getsiteUrl
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 14:58:14 UTC (rev 746)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-22 14:03:19 UTC (rev 747)
@@ -78,9 +78,10 @@
return sw.getBuffer().toString();
}
+ String BASEURL = TreebaseUtil.getSiteUrl();
// apache server re-write the application path to localhost
//String[] baseURL=httpRequest.getRequestURL().toString().split("handshaking");
- String importURL= "BASEURL" + "/login.jsp?importKey=" + systemTime;
+ String importURL= BASEURL + "login.jsp?importKey=" + systemTime;
return importURL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X