hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git

Browse Source
This commit is contained in:
Michael Hierweck 2012-09-20 17:13:30 +02:00
commit 796799bc63
3 changed files with 124 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hsarback/database/schema.sql
View File

@ -912,16 +912,17 @@ CREATE TABLE domain_option (
);
ALTER TABLE ONLY domain_option
ADD CONSTRAINT domain_option_uniq UNIQUE (domain_option_id);
ADD CONSTRAINT pk_domain_option PRIMARY KEY (domain_option_id);
CREATE UNIQUE INDEX ON domain_option ( domain_option_name );
CREATE UNIQUE INDEX domain_option_name_idx ON domain_option USING btree ( domain_option_name );
CREATE TABLE domain__domain_option (
domain_option_id integer NOT NULL,
domain_id integer NOT NULL
);
CREATE UNIQUE INDEX unique_domain__domain_option ON domain__domain_option USING btree (domain_option_id, domain_id);
ALTER TABLE ONLY domain__domain_option
ADD CONSTRAINT pk_domain__domain_option PRIMARY KEY (domain_option_id, domain_id);
ALTER TABLE ONLY domain__domain_option
ADD CONSTRAINT domain_option_id_fkey FOREIGN KEY (domain_option_id)

6
hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
View File

@ -249,13 +249,13 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
"chmod g+rx " + homeDir + " && " +
"mkdir --mode=1550 --parents " + domsDir + " && " +
"chown httpd:" + pacName + " " + domsDir + " && " +
"mkdir --mode=750 " + domainDir + " && " +
"mkdir --mode=750 --parents " + domainDir + " && " +
"chown " + userName + ":httpd " + domainDir
);
CompoundProcessor domDirsProcessor = new CompoundProcessor(mkDomainDirProzessor);
for (String subDir : subDirs) {
domDirsProcessor.appendProcessor(new ShellProcessor(
"mkdir --mode=755 " + domainDir + "/" + subDir + " && " +
"mkdir --mode=755 --parents " + domainDir + "/" + subDir + " && " +
"chown " + userName + ":" + pacName + " " + domainDir + "/" + subDir
));
}
@ -288,7 +288,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
);
}
domDirsProcessor.appendProcessor(
new ShellProcessor("ln -s " + domainDir + " /home/doms/ && " +
new ShellProcessor("ln -sf " + domainDir + " /home/doms/ && " +
"chown --no-dereference " + userName + ":httpd /home/doms/" + domName
+ " && " + "chown " + userName + ":httpd /home/doms/" + domName + "/")
);

117
hsarback/test/de/hsadmin/remote/DomainTest.java
View File

@ -6,6 +6,13 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.net.Socket;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -122,6 +129,7 @@ public class DomainTest {
@Test
public void testDomainOption() {
// these tests build upon each other
testZeroOptions();
testOneValidOption();
testTwoValidOptions();
testZeroOptions();
@ -212,6 +220,68 @@ public class DomainTest {
}
}
@Test
public void testNogreylisting() throws UnknownHostException, IOException {
testNogreylistingOnOff(true, "Nogreylisting zuerst an");
testNogreylistingOnOff(false, "Nogreylisting als zweites aus");
testNogreylistingOnOff(true, "Nogreylisting zuletzt wieder an");
}
public void testNogreylistingOnOff(boolean onoff, String message) throws UnknownHostException, IOException {
String user = "aaa00";
String domain = "example01.org";
String grantingTicketURL = cas.getGrantingTicketURL(user);
Map<String, Object> setParams = new HashMap<String, Object>();
Map<String, String> whereParams = new HashMap<String, String>();
List<String> optionslist = new ArrayList<String>();
if(onoff) {
optionslist.add("nogreylisting");
}
setParams.put("domainoptions", optionslist);
whereParams.put("name", domain);
Object[] params = new Object[] { user,
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
setParams, whereParams };
try {
Object execute = client.execute(MODULE + ".update", params);
assertNotNull(execute);
assertEquals(message, onoff, getNogreylisting(domain));
} catch (XmlRpcException e) {
}
}
@Test
public void testNohtdocsfallback() throws UnknownHostException, IOException {
testNohtdocsfallbackOnOff(false, "Nothdocsfallback zuerst aus");
testNohtdocsfallbackOnOff(true, "Nothdocsfallback als zweites an");
testNohtdocsfallbackOnOff(false, "Nothdocsfallback zuletzt wieder aus");
}
@Test
public void testNohtdocsfallbackOnOff( boolean onoff, String message) throws UnknownHostException, IOException {
String user = "aaa00";
String domain = "example01.org";
String grantingTicketURL = cas.getGrantingTicketURL(user);
Map<String, Object> setParams = new HashMap<String, Object>();
Map<String, String> whereParams = new HashMap<String, String>();
List<String> optionslist = new ArrayList<String>();
if(onoff) {
optionslist.add("nohtdocsfallback");
}
setParams.put("domainoptions", optionslist);
whereParams.put("name", domain);
Object[] params = new Object[] { user,
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
setParams, whereParams };
try {
Object execute = client.execute(MODULE + ".update", params);
assertNotNull(execute);
assertEquals(message, onoff, getNohtdocsfallback(domain));
} catch (XmlRpcException e) {
}
}
private int getDomsCount() {
int count = 0;
String user = "aaa00";
@ -258,4 +328,51 @@ public class DomainTest {
return count;
}
private boolean getNogreylisting(String domain) throws UnknownHostException, IOException {
String host = "test-h99.hostsharing.net";
String answer = socketQuery( host, 25,
"HELO " + domain + "\n" +
"MAIl FROM: hsadmin-testing@" + domain + "\n" +
"RCPT TO: postmaster@" + domain + "\n" +
"DATA\n" +
".\n") ;
return answer.contains("450") && answer.contains("reylisting");
}
private boolean getNohtdocsfallback(String domain) throws UnknownHostException, IOException {
String host = "test-h99.hostsharing.net";
String answer = socketQuery( host, 80,
"GET / HTTP/1.1\n" +
"Host: x.y.z." + domain +
"User-Agent: hsAdmin Test\n" +
"Connection: close\n");
answer = answer.substring(0, answer.indexOf("\n"));
return answer.contains("404");
}
private String socketQuery( String host, int port, String query) throws UnknownHostException, IOException{
Socket socket = new Socket( host, port );
socketQueryWriter( socket, query );
return socketQueryReader(socket);
}
private void socketQueryWriter( Socket socket, String buffer) throws IOException{
PrintWriter printWriter =
new PrintWriter(
new OutputStreamWriter(
socket.getOutputStream()));
printWriter.print(buffer);
printWriter.flush();
}
private String socketQueryReader( Socket socket ) throws IOException{
int maxbufferbytecount = 4099;
BufferedReader bufferedReader =
new BufferedReader(
new InputStreamReader(
socket.getInputStream()));
char[] buffer = new char[maxbufferbytecount];
int bufferbytecount = bufferedReader.read(buffer, 0, maxbufferbytecount); // blocks til end of transmission
return new String(buffer, 0, bufferbytecount);
}
}