move back to master
This commit is contained in:
Peter Hormanns
commit
a51b3ea04c
@ -1,8 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<classpath>
|
|
||||||
<classpathentry kind="src" path="src"/>
|
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
|
|
||||||
<classpathentry kind="lib" path="lib/cas-server-core-3.4.2.1.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/commons-codec-1.4.jar"/>
|
|
||||||
<classpathentry kind="output" path="bin"/>
|
|
||||||
</classpath>
|
|
||||||
2
authenticator/.gitignore
vendored
2
authenticator/.gitignore
vendored
@ -1,2 +0,0 @@
|
|||||||
/build
|
|
||||||
/bin
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<projectDescription>
|
|
||||||
<name>authenticator</name>
|
|
||||||
<comment></comment>
|
|
||||||
<projects>
|
|
||||||
</projects>
|
|
||||||
<buildSpec>
|
|
||||||
<buildCommand>
|
|
||||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
|
||||||
<arguments>
|
|
||||||
</arguments>
|
|
||||||
</buildCommand>
|
|
||||||
</buildSpec>
|
|
||||||
<natures>
|
|
||||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
|
||||||
</natures>
|
|
||||||
</projectDescription>
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
#Tue Sep 07 14:25:06 CEST 2010
|
|
||||||
eclipse.preferences.version=1
|
|
||||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
|
||||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
|
|
||||||
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
|
|
||||||
org.eclipse.jdt.core.compiler.compliance=1.6
|
|
||||||
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
|
|
||||||
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
|
||||||
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
|
||||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
|
||||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
|
||||||
org.eclipse.jdt.core.compiler.source=1.6
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
#Tue Sep 07 16:36:06 CEST 2010
|
|
||||||
eclipse.preferences.version=1
|
|
||||||
validateFragments=false
|
|
||||||
validation.actions-missing-required-attribute=-1
|
|
||||||
validation.actions-non-empty-inline-tag=-1
|
|
||||||
validation.actions-unexpected-rtexprvalue=-1
|
|
||||||
validation.actions-unknown-attribute=-1
|
|
||||||
validation.directive-include-fragment-file-not-found=-1
|
|
||||||
validation.directive-include-fragment-file-not-specified=-1
|
|
||||||
validation.directive-taglib-duplicate-prefixes-different-uris=-1
|
|
||||||
validation.directive-taglib-duplicate-prefixes-same-uris=-1
|
|
||||||
validation.directive-taglib-missing-prefix=-1
|
|
||||||
validation.directive-taglib-missing-uri-or-tagdir=-1
|
|
||||||
validation.directive-taglib-unresolvable-uri-or-tagdir=-1
|
|
||||||
validation.el-general-syntax=-1
|
|
||||||
validation.el-lexical-failure=-1
|
|
||||||
validation.java-=-1
|
|
||||||
validation.java-local-variable-is-never-used=-1
|
|
||||||
validation.java-null-local-variable-reference=-1
|
|
||||||
validation.java-potential-null-local-variable-reference=-1
|
|
||||||
validation.java-unused-import=-1
|
|
||||||
validation.translation-tag-class-not-found=-1
|
|
||||||
validation.translation-tei-class-not-found=-1
|
|
||||||
validation.translation-tei-class-not-instantiated=-1
|
|
||||||
validation.translation-tei-class-runtime-exception=-1
|
|
||||||
validation.translation-tei-message=-1
|
|
||||||
validation.translation-usebean-ambiguous-type-info=-1
|
|
||||||
validation.translation-usebean-invalid-id=-1
|
|
||||||
validation.translation-usebean-missing-type-info=-1
|
|
||||||
validation.use-project-settings=true
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
#Tue Sep 07 16:37:46 CEST 2010
|
|
||||||
DELEGATES_PREFERENCE=delegateValidatorList
|
|
||||||
USER_BUILD_PREFERENCE=enabledBuildValidatorList
|
|
||||||
USER_MANUAL_PREFERENCE=enabledManualValidatorList
|
|
||||||
USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationtrueversion1.2.200.v201005271900
|
|
||||||
eclipse.preferences.version=1
|
|
||||||
override=true
|
|
||||||
suspend=true
|
|
||||||
vals/org.eclipse.jst.jsp.core.JSPBatchValidator/global=FF01
|
|
||||||
vals/org.eclipse.jst.jsp.core.JSPContentValidator/global=FF01
|
|
||||||
vals/org.eclipse.jst.jsp.core.TLDValidator/global=FF01
|
|
||||||
vals/org.eclipse.wst.dtd.core.dtdDTDValidator/global=FF01
|
|
||||||
vals/org.eclipse.wst.html.ui.HTMLValidator/global=FF01
|
|
||||||
vals/org.eclipse.wst.wsdl.validation.wsdl/global=FF02158org.eclipse.wst.wsdl.validation.internal.eclipse.Validator
|
|
||||||
vals/org.eclipse.wst.xml.core.xml/global=FF03
|
|
||||||
vals/org.eclipse.wst.xsd.core.xsd/global=FF02162org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator
|
|
||||||
vals/org.eclipse.wst.xsl.core.xsl/global=FF02
|
|
||||||
vf.version=3
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
#Tue Sep 07 16:36:08 CEST 2010
|
|
||||||
CHECK_CALL_TEMPLATES=2
|
|
||||||
CHECK_XPATHS=2
|
|
||||||
CIRCULAR_REF=2
|
|
||||||
DUPLICATE_PARAMETER=2
|
|
||||||
EMPTY_PARAM=1
|
|
||||||
MISSING_INCLUDE=2
|
|
||||||
MISSING_PARAM=1
|
|
||||||
NAME_ATTRIBUTE_EMPTY=2
|
|
||||||
NAME_ATTRIBUTE_MISSING=2
|
|
||||||
TEMPLATE_CONFLICT=2
|
|
||||||
eclipse.preferences.version=1
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
|
|
||||||
<project name="authenticator" default="default" basedir=".">
|
|
||||||
|
|
||||||
<property file="${user.home}/.hsar.ant.properties" />
|
|
||||||
<property name="lib.home" value="${basedir}/lib" />
|
|
||||||
<property name="src.home" value="${basedir}/src" />
|
|
||||||
<property name="war.home" value="${basedir}/webapp" />
|
|
||||||
<property name="cls.home" value="${war.home}/WEB-INF/classes" />
|
|
||||||
<property name="compile.debug" value="true" />
|
|
||||||
|
|
||||||
<path id="compile.classpath">
|
|
||||||
<fileset dir="lib">
|
|
||||||
<include name="*.jar" />
|
|
||||||
</fileset>
|
|
||||||
</path>
|
|
||||||
|
|
||||||
<target name="default" depends="compile" description="Patch WAR File">
|
|
||||||
<echo message="target war: ${cas.openedwar}"/>
|
|
||||||
<copy todir="${cas.openedwar}">
|
|
||||||
<fileset dir="${war.home}"/>
|
|
||||||
</copy>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="compile" description="Compile Authenticator">
|
|
||||||
<javac srcdir="${src.home}" destdir="${cls.home}" debug="${compile.debug}">
|
|
||||||
<classpath refid="compile.classpath" />
|
|
||||||
</javac>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="clean" description="Remove compiled classes">
|
|
||||||
<delete dir="${cls.home}/de"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
Binary file not shown.
Binary file not shown.
@ -1,143 +0,0 @@
|
|||||||
package de.hsadmin.cas;
|
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStreamReader;
|
|
||||||
import java.io.OutputStreamWriter;
|
|
||||||
import java.io.Writer;
|
|
||||||
import java.net.Socket;
|
|
||||||
import java.net.UnknownHostException;
|
|
||||||
import java.security.KeyManagementException;
|
|
||||||
import java.security.NoSuchAlgorithmException;
|
|
||||||
|
|
||||||
import javax.net.ssl.SSLContext;
|
|
||||||
import javax.net.ssl.SSLSocketFactory;
|
|
||||||
|
|
||||||
import org.apache.commons.codec.binary.Base64;
|
|
||||||
import org.jasig.cas.authentication.handler.AuthenticationException;
|
|
||||||
import org.jasig.cas.authentication.handler.AuthenticationHandler;
|
|
||||||
import org.jasig.cas.authentication.principal.Credentials;
|
|
||||||
import org.jasig.cas.authentication.principal.UsernamePasswordCredentials;
|
|
||||||
|
|
||||||
public class SmtpAuthenticator implements AuthenticationHandler {
|
|
||||||
|
|
||||||
private static final int SMTPS_PORT = 465;
|
|
||||||
|
|
||||||
public boolean authenticate(Credentials creds)
|
|
||||||
throws AuthenticationException {
|
|
||||||
UsernamePasswordCredentials ucreds = (UsernamePasswordCredentials) creds;
|
|
||||||
try {
|
|
||||||
return isAuthenticated(ucreds.getUsername(), ucreds.getPassword());
|
|
||||||
} catch (SmtpAuthException e) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean supports(Credentials creds) {
|
|
||||||
return creds instanceof UsernamePasswordCredentials;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isAuthenticated(String user, String passwd)
|
|
||||||
throws SmtpAuthException {
|
|
||||||
boolean isAuth = false;
|
|
||||||
Socket socket = null;
|
|
||||||
try {
|
|
||||||
SSLContext sc = SSLContext.getInstance("SSLv3");
|
|
||||||
sc.init(null, null, null);
|
|
||||||
SSLSocketFactory ssf = sc.getSocketFactory();
|
|
||||||
if ( user == null || user.length() < 2 || user.length() == 4 ) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (user.indexOf('@') > 0) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
if (user.length() == 2) {
|
|
||||||
user = "hsh01-" + user;
|
|
||||||
}
|
|
||||||
if (user.length() == 3) {
|
|
||||||
user = "hsh00-" + user;
|
|
||||||
}
|
|
||||||
socket = ssf.createSocket(user.substring(0, 5)
|
|
||||||
+ ".hostsharing.net", SMTPS_PORT);
|
|
||||||
} catch (StringIndexOutOfBoundsException e) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
Writer out = new OutputStreamWriter(socket.getOutputStream(),
|
|
||||||
"ISO-8859-1");
|
|
||||||
BufferedReader sin = new BufferedReader(new InputStreamReader(
|
|
||||||
socket.getInputStream(), "ISO-8859-1"));
|
|
||||||
write(out, "EHLO login.hostsharing.net\r\n");
|
|
||||||
String answer = read(sin, "220 ");
|
|
||||||
answer = read(sin, "250-");
|
|
||||||
StringBuffer userPasswd = new StringBuffer();
|
|
||||||
userPasswd.append('\000');
|
|
||||||
userPasswd.append(user);
|
|
||||||
userPasswd.append('\000');
|
|
||||||
userPasswd.append(passwd);
|
|
||||||
write(out, "AUTH PLAIN "
|
|
||||||
+ new String(Base64.encodeBase64(userPasswd.toString().getBytes())) + "\r\n");
|
|
||||||
answer = read(sin, "000");
|
|
||||||
isAuth = answer.startsWith("235");
|
|
||||||
write(out, "QUIT\r\n");
|
|
||||||
} catch (NoSuchAlgorithmException e) {
|
|
||||||
throw new SmtpAuthException(e.getMessage());
|
|
||||||
} catch (KeyManagementException e) {
|
|
||||||
throw new SmtpAuthException(e.getMessage());
|
|
||||||
} catch (UnknownHostException e) {
|
|
||||||
throw new SmtpAuthException(e.getMessage());
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new SmtpAuthException(e.getMessage());
|
|
||||||
} finally {
|
|
||||||
if (socket != null) {
|
|
||||||
try {
|
|
||||||
socket.close();
|
|
||||||
} catch (IOException e) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return isAuth;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void write(Writer wr, String line) {
|
|
||||||
try {
|
|
||||||
wr.write(line);
|
|
||||||
wr.flush();
|
|
||||||
} catch (IOException e) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private String read(BufferedReader rd, String returnCode) {
|
|
||||||
try {
|
|
||||||
String line = rd.readLine();
|
|
||||||
while (line != null && line.startsWith(returnCode)) {
|
|
||||||
line = rd.readLine();
|
|
||||||
}
|
|
||||||
return line;
|
|
||||||
} catch (IOException e) {
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
public class SmtpAuthException extends Exception {
|
|
||||||
|
|
||||||
private static final long serialVersionUID = 2394310295147904537L;
|
|
||||||
|
|
||||||
public SmtpAuthException(String message) {
|
|
||||||
super(message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
SmtpAuthenticator auth = new SmtpAuthenticator();
|
|
||||||
try {
|
|
||||||
if (auth.isAuthenticated(args[0], args[1])) {
|
|
||||||
System.out.println("Login " + args[0] + " Ok");
|
|
||||||
} else {
|
|
||||||
System.out.println("Falsches Login");
|
|
||||||
}
|
|
||||||
} catch (SmtpAuthException e) {
|
|
||||||
System.out.println(e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
cas.securityContext.serviceProperties.service=http://login.hostsharing.net/cas/services/j_acegi_cas_security_check
|
|
||||||
# Names of roles allowed to access the CAS service manager
|
|
||||||
cas.securityContext.serviceProperties.adminRoles=ROLE_ADMIN
|
|
||||||
cas.securityContext.casProcessingFilterEntryPoint.loginUrl=http://login.hostsharing.net/cas/login
|
|
||||||
cas.securityContext.ticketValidator.casServerUrlPrefix=http://login.hostsharing.net/cas
|
|
||||||
cas.themeResolver.defaultThemeName=hostsharing
|
|
||||||
cas.viewResolver.basename=hostsharing_views
|
|
||||||
host.name=login.hostsharing.net
|
|
||||||
#database.hibernate.dialect=org.hibernate.dialect.OracleDialect
|
|
||||||
#database.hibernate.dialect=org.hibernate.dialect.MySQLDialect
|
|
||||||
database.hibernate.dialect=org.hibernate.dialect.HSQLDialect
|
|
||||||
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
|||||||
mobile.custom.css.file=css/default-mobile-custom.css
|
|
||||||
standard.custom.css.file=themes/hostsharing/cas.css
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
### Login view (/login)
|
|
||||||
casLoginView.(class)=org.springframework.web.servlet.view.JstlView
|
|
||||||
casLoginView.url=/WEB-INF/view/jsp/hostsharing/ui/casLoginView.jsp
|
|
||||||
|
|
||||||
### Login confirmation view (logged in, warn=true)
|
|
||||||
casLoginConfirmView.(class)=org.springframework.web.servlet.view.JstlView
|
|
||||||
casLoginConfirmView.url=/WEB-INF/view/jsp/hostsharing/ui/casConfirmView.jsp
|
|
||||||
|
|
||||||
### Logged-in view (logged in, no service provided)
|
|
||||||
casLoginGenericSuccessView.(class)=org.springframework.web.servlet.view.JstlView
|
|
||||||
casLoginGenericSuccessView.url=/WEB-INF/view/jsp/hostsharing/ui/casGenericSuccess.jsp
|
|
||||||
|
|
||||||
### Logout view (/logout)
|
|
||||||
casLogoutView.(class)=org.springframework.web.servlet.view.JstlView
|
|
||||||
casLogoutView.url=/WEB-INF/view/jsp/hostsharing/ui/casLogoutView.jsp
|
|
||||||
|
|
||||||
### CAS error view
|
|
||||||
viewServiceErrorView.(class)=org.springframework.web.servlet.view.JstlView
|
|
||||||
viewServiceErrorView.url=/WEB-INF/view/jsp/hostsharing/ui/serviceErrorView.jsp
|
|
||||||
|
|
||||||
viewServiceSsoErrorView.(class)=org.springframework.web.servlet.view.JstlView
|
|
||||||
viewServiceSsoErrorView.url=/WEB-INF/view/jsp/hostsharing/ui/serviceErrorSsoView.jsp
|
|
||||||
|
|
||||||
### Services Management Views
|
|
||||||
addServiceView.(class)=org.springframework.web.servlet.view.JstlView
|
|
||||||
addServiceView.url=/WEB-INF/view/jsp/services/add.jsp
|
|
||||||
|
|
||||||
editServiceView.(class)=org.springframework.web.servlet.view.JstlView
|
|
||||||
editServiceView.url=/WEB-INF/view/jsp/services/add.jsp
|
|
||||||
|
|
||||||
manageServiceView.(class)=org.springframework.web.servlet.view.JstlView
|
|
||||||
manageServiceView.url=/WEB-INF/view/jsp/services/manage.jsp
|
|
||||||
|
|
||||||
serviceLogoutView.(class)=org.springframework.web.servlet.view.JstlView
|
|
||||||
serviceLogoutView.url=/WEB-INF/view/jsp/services/logout.jsp
|
|
||||||
|
|
||||||
viewStatisticsView.(class)=org.springframework.web.servlet.view.JstlView
|
|
||||||
viewStatisticsView.url=/WEB-INF/view/jsp/services/viewStatistics.jsp
|
|
||||||
@ -1,171 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
| deployerConfigContext.xml centralizes into one file some of the declarative configuration that
|
|
||||||
| all CAS deployers will need to modify.
|
|
||||||
|
|
|
||||||
| This file declares some of the Spring-managed JavaBeans that make up a CAS deployment.
|
|
||||||
| The beans declared in this file are instantiated at context initialization time by the Spring
|
|
||||||
| ContextLoaderListener declared in web.xml. It finds this file because this
|
|
||||||
| file is among those declared in the context parameter "contextConfigLocation".
|
|
||||||
|
|
|
||||||
| By far the most common change you will need to make in this file is to change the last bean
|
|
||||||
| declaration to replace the default SimpleTestUsernamePasswordAuthenticationHandler with
|
|
||||||
| one implementing your approach for authenticating usernames and passwords.
|
|
||||||
+-->
|
|
||||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xmlns:p="http://www.springframework.org/schema/p"
|
|
||||||
xmlns:sec="http://www.springframework.org/schema/security"
|
|
||||||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
|
|
||||||
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd">
|
|
||||||
<!--
|
|
||||||
| This bean declares our AuthenticationManager. The CentralAuthenticationService service bean
|
|
||||||
| declared in applicationContext.xml picks up this AuthenticationManager by reference to its id,
|
|
||||||
| "authenticationManager". Most deployers will be able to use the default AuthenticationManager
|
|
||||||
| implementation and so do not need to change the class of this bean. We include the whole
|
|
||||||
| AuthenticationManager here in the userConfigContext.xml so that you can see the things you will
|
|
||||||
| need to change in context.
|
|
||||||
+-->
|
|
||||||
<bean id="authenticationManager"
|
|
||||||
class="org.jasig.cas.authentication.AuthenticationManagerImpl">
|
|
||||||
<!--
|
|
||||||
| This is the List of CredentialToPrincipalResolvers that identify what Principal is trying to authenticate.
|
|
||||||
| The AuthenticationManagerImpl considers them in order, finding a CredentialToPrincipalResolver which
|
|
||||||
| supports the presented credentials.
|
|
||||||
|
|
|
||||||
| AuthenticationManagerImpl uses these resolvers for two purposes. First, it uses them to identify the Principal
|
|
||||||
| attempting to authenticate to CAS /login . In the default configuration, it is the DefaultCredentialsToPrincipalResolver
|
|
||||||
| that fills this role. If you are using some other kind of credentials than UsernamePasswordCredentials, you will need to replace
|
|
||||||
| DefaultCredentialsToPrincipalResolver with a CredentialsToPrincipalResolver that supports the credentials you are
|
|
||||||
| using.
|
|
||||||
|
|
|
||||||
| Second, AuthenticationManagerImpl uses these resolvers to identify a service requesting a proxy granting ticket.
|
|
||||||
| In the default configuration, it is the HttpBasedServiceCredentialsToPrincipalResolver that serves this purpose.
|
|
||||||
| You will need to change this list if you are identifying services by something more or other than their callback URL.
|
|
||||||
+-->
|
|
||||||
<property name="credentialsToPrincipalResolvers">
|
|
||||||
<list>
|
|
||||||
<!--
|
|
||||||
| UsernamePasswordCredentialsToPrincipalResolver supports the UsernamePasswordCredentials that we use for /login
|
|
||||||
| by default and produces SimplePrincipal instances conveying the username from the credentials.
|
|
||||||
|
|
|
||||||
| If you've changed your LoginFormAction to use credentials other than UsernamePasswordCredentials then you will also
|
|
||||||
| need to change this bean declaration (or add additional declarations) to declare a CredentialsToPrincipalResolver that supports the
|
|
||||||
| Credentials you are using.
|
|
||||||
+-->
|
|
||||||
<bean
|
|
||||||
class="org.jasig.cas.authentication.principal.UsernamePasswordCredentialsToPrincipalResolver" />
|
|
||||||
<!--
|
|
||||||
| HttpBasedServiceCredentialsToPrincipalResolver supports HttpBasedCredentials. It supports the CAS 2.0 approach of
|
|
||||||
| authenticating services by SSL callback, extracting the callback URL from the Credentials and representing it as a
|
|
||||||
| SimpleService identified by that callback URL.
|
|
||||||
|
|
|
||||||
| If you are representing services by something more or other than an HTTPS URL whereat they are able to
|
|
||||||
| receive a proxy callback, you will need to change this bean declaration (or add additional declarations).
|
|
||||||
+-->
|
|
||||||
<bean
|
|
||||||
class="org.jasig.cas.authentication.principal.HttpBasedServiceCredentialsToPrincipalResolver" />
|
|
||||||
</list>
|
|
||||||
</property>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
| Whereas CredentialsToPrincipalResolvers identify who it is some Credentials might authenticate,
|
|
||||||
| AuthenticationHandlers actually authenticate credentials. Here we declare the AuthenticationHandlers that
|
|
||||||
| authenticate the Principals that the CredentialsToPrincipalResolvers identified. CAS will try these handlers in turn
|
|
||||||
| until it finds one that both supports the Credentials presented and succeeds in authenticating.
|
|
||||||
+-->
|
|
||||||
<property name="authenticationHandlers">
|
|
||||||
<list>
|
|
||||||
<!--
|
|
||||||
| This is the authentication handler that authenticates services by means of callback via SSL, thereby validating
|
|
||||||
| a server side SSL certificate.
|
|
||||||
+-->
|
|
||||||
<bean class="org.jasig.cas.authentication.handler.support.HttpBasedServiceCredentialsAuthenticationHandler"
|
|
||||||
p:httpClient-ref="httpClient" />
|
|
||||||
<!--
|
|
||||||
| This is the authentication handler declaration that every CAS deployer will need to change before deploying CAS
|
|
||||||
| into production. The default SimpleTestUsernamePasswordAuthenticationHandler authenticates UsernamePasswordCredentials
|
|
||||||
| where the username equals the password. You will need to replace this with an AuthenticationHandler that implements your
|
|
||||||
| local authentication strategy. You might accomplish this by coding a new such handler and declaring
|
|
||||||
| edu.someschool.its.cas.MySpecialHandler here, or you might use one of the handlers provided in the adaptors modules.
|
|
||||||
+-->
|
|
||||||
<bean
|
|
||||||
class="de.hsadmin.cas.SmtpAuthenticator" />
|
|
||||||
</list>
|
|
||||||
</property>
|
|
||||||
</bean>
|
|
||||||
|
|
||||||
|
|
||||||
<!--
|
|
||||||
This bean defines the security roles for the Services Management application. Simple deployments can use the in-memory version.
|
|
||||||
More robust deployments will want to use another option, such as the Jdbc version.
|
|
||||||
|
|
||||||
The name of this should remain "userDetailsService" in order for Spring Security to find it.
|
|
||||||
|
|
||||||
To use this, you should add an entry similar to the following between the two value tags:
|
|
||||||
battags=notused,ROLE_ADMIN
|
|
||||||
|
|
||||||
where battags is the username you want to grant access to. You can put one entry per line.
|
|
||||||
-->
|
|
||||||
<!-- <sec:user name="@@THIS SHOULD BE REPLACED@@" password="notused" authorities="ROLE_ADMIN" />-->
|
|
||||||
|
|
||||||
<sec:user-service id="userDetailsService">
|
|
||||||
<sec:user name="pe" password="notused" authorities="ROLE_ADMIN" />
|
|
||||||
</sec:user-service>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Bean that defines the attributes that a service may return. This example uses the Stub/Mock version. A real implementation
|
|
||||||
may go against a database or LDAP server. The id should remain "attributeRepository" though.
|
|
||||||
-->
|
|
||||||
<bean id="attributeRepository"
|
|
||||||
class="org.jasig.services.persondir.support.StubPersonAttributeDao">
|
|
||||||
<property name="backingMap">
|
|
||||||
<map>
|
|
||||||
<entry key="uid" value="uid" />
|
|
||||||
<entry key="eduPersonAffiliation" value="eduPersonAffiliation" />
|
|
||||||
<entry key="groupMembership" value="groupMembership" />
|
|
||||||
</map>
|
|
||||||
</property>
|
|
||||||
</bean>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Sample, in-memory data store for the ServiceRegistry. A real implementation
|
|
||||||
would probably want to replace this with the JPA-backed ServiceRegistry DAO
|
|
||||||
The name of this bean should remain "serviceRegistryDao".
|
|
||||||
-->
|
|
||||||
<bean
|
|
||||||
id="serviceRegistryDao"
|
|
||||||
class="org.jasig.cas.services.InMemoryServiceRegistryDaoImpl">
|
|
||||||
<property name="registeredServices">
|
|
||||||
<list>
|
|
||||||
<bean class="org.jasig.cas.services.RegisteredServiceImpl">
|
|
||||||
<property name="id" value="0" />
|
|
||||||
<property name="name" value="HTTP" />
|
|
||||||
<property name="description" value="Only Allows HTTP Urls" />
|
|
||||||
<property name="serviceId" value="http://**" />
|
|
||||||
</bean>
|
|
||||||
|
|
||||||
<bean class="org.jasig.cas.services.RegisteredServiceImpl">
|
|
||||||
<property name="id" value="1" />
|
|
||||||
<property name="name" value="HTTPS" />
|
|
||||||
<property name="description" value="Only Allows HTTPS Urls" />
|
|
||||||
<property name="serviceId" value="https://**" />
|
|
||||||
</bean>
|
|
||||||
|
|
||||||
<bean class="org.jasig.cas.services.RegisteredServiceImpl">
|
|
||||||
<property name="id" value="2" />
|
|
||||||
<property name="name" value="IMAPS" />
|
|
||||||
<property name="description" value="Only Allows HTTPS Urls" />
|
|
||||||
<property name="serviceId" value="imaps://**" />
|
|
||||||
</bean>
|
|
||||||
|
|
||||||
<bean class="org.jasig.cas.services.RegisteredServiceImpl">
|
|
||||||
<property name="id" value="3" />
|
|
||||||
<property name="name" value="IMAP" />
|
|
||||||
<property name="description" value="Only Allows IMAP Urls" />
|
|
||||||
<property name="serviceId" value="imap://**" />
|
|
||||||
</bean>
|
|
||||||
</list>
|
|
||||||
</property>
|
|
||||||
</bean>
|
|
||||||
</beans>
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
<jsp:directive.include file="/WEB-INF/view/jsp/default/ui/includes/top.jsp" />
|
|
||||||
<div id="status" class="errors">
|
|
||||||
<h2><spring:message code="screen.blocked.header" /></h2>
|
|
||||||
<p><spring:message code="screen.blocked.message" /></p>
|
|
||||||
</div>
|
|
||||||
<jsp:directive.include file="/WEB-INF/view/jsp/default/ui/includes/bottom.jsp" />
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
<jsp:directive.include file="includes/top.jsp" />
|
|
||||||
<div class="info"><p>
|
|
||||||
<spring:message
|
|
||||||
code="screen.confirmation.message"
|
|
||||||
arguments="${fn:escapeXml(param.service)}${fn:indexOf(param.service, '?') eq -1 ? '?' : '&'}ticket=${serviceTicketId}" />
|
|
||||||
</p></div>
|
|
||||||
<jsp:directive.include file="includes/bottom.jsp" />
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
<jsp:directive.include file="includes/top.jsp" />
|
|
||||||
<div id="msg" class="success">
|
|
||||||
<h2><spring:message code="screen.success.header" /></h2>
|
|
||||||
<p><spring:message code="screen.success.success" /></p>
|
|
||||||
<p><spring:message code="screen.success.security" /></p>
|
|
||||||
</div>
|
|
||||||
<jsp:directive.include file="includes/bottom.jsp" />
|
|
||||||
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
<%@ page contentType="text/html; charset=UTF-8" %>
|
|
||||||
<jsp:directive.include file="includes/top.jsp" />
|
|
||||||
<form:form method="post" id="fm1" cssClass="fm-v clearfix" commandName="${commandName}" htmlEscape="true">
|
|
||||||
<form:errors path="*" cssClass="errors" id="status" element="div" />
|
|
||||||
<div class="box fl-panel" id="login">
|
|
||||||
<h2>Bitte geben Sie Ihren Benutzernamen und Ihr Passwort ein.</h2>
|
|
||||||
<div class="row fl-controls-left">
|
|
||||||
<label for="username" class="fl-label">Benutzername</label>
|
|
||||||
<c:if test="${not empty sessionScope.openIdLocalId}">
|
|
||||||
<strong>${sessionScope.openIdLocalId}</strong>
|
|
||||||
<input type="hidden" id="username" name="username" value="${sessionScope.openIdLocalId}" />
|
|
||||||
</c:if>
|
|
||||||
<c:if test="${empty sessionScope.openIdLocalId}">
|
|
||||||
<spring:message code="screen.welcome.label.netid.accesskey" var="userNameAccessKey" />
|
|
||||||
<form:input cssClass="required" cssErrorClass="error" id="username" size="25" tabindex="1" accesskey="${userNameAccessKey}" path="username" htmlEscape="true" />
|
|
||||||
</c:if>
|
|
||||||
</div>
|
|
||||||
<div class="row fl-controls-left">
|
|
||||||
<label for="password" class="fl-label">Passwort</label>
|
|
||||||
<spring:message code="screen.welcome.label.password.accesskey" var="passwordAccessKey" />
|
|
||||||
<form:password cssClass="required" cssErrorClass="error" id="password" size="25" tabindex="2" path="password" accesskey="${passwordAccessKey}" htmlEscape="true" />
|
|
||||||
</div>
|
|
||||||
<div class="row btn-row">
|
|
||||||
<input id="warn" name="warn" value="true" type="hidden" />
|
|
||||||
<input type="hidden" name="lt" value="${flowExecutionKey}" />
|
|
||||||
<input type="hidden" name="_eventId" value="submit" />
|
|
||||||
<input class="btn-submit" name="submit" accesskey="l" value="<spring:message code="screen.welcome.button.login" />" tabindex="4" type="submit" />
|
|
||||||
<input class="btn-reset" name="reset" accesskey="c" value="<spring:message code="screen.welcome.button.clear" />" tabindex="5" type="reset" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form:form>
|
|
||||||
<div id="sidebar">
|
|
||||||
</div>
|
|
||||||
<jsp:directive.include file="includes/bottom.jsp" />
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
<jsp:directive.include file="includes/top.jsp" />
|
|
||||||
<div id="msg" class="success">
|
|
||||||
<h2><spring:message code="screen.logout.header" /></h2>
|
|
||||||
<p><spring:message code="screen.logout.success" /></p>
|
|
||||||
<p><spring:message code="screen.logout.security" /></p>
|
|
||||||
</div>
|
|
||||||
<jsp:directive.include file="includes/bottom.jsp" />
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
</div>
|
|
||||||
<div id="footer">
|
|
||||||
<a href="https://www.hostsharing.net/impressum" title="Impressum">Impressum</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
<%@ page session="true" %>
|
|
||||||
<%@ page pageEncoding="UTF-8" %>
|
|
||||||
<%@ page contentType="text/html; charset=UTF-8" %>
|
|
||||||
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
|
|
||||||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
|
|
||||||
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
|
|
||||||
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
|
|
||||||
<!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" lang="de">
|
|
||||||
<head>
|
|
||||||
<title>Hostsharing - Central Authentication Service (CAS)</title>
|
|
||||||
<link type="text/css" rel="stylesheet" href="themes/hostsharing/cas.css" />
|
|
||||||
<link rel="icon" href="themes/hostsharing/favicon.ico" type="image/x-icon" />
|
|
||||||
<script type="text/javascript" src="js/common_rosters.js"></script>
|
|
||||||
</head>
|
|
||||||
<body onload="init();">
|
|
||||||
<div id="page">
|
|
||||||
<div id="logo">
|
|
||||||
</div>
|
|
||||||
<div id="header">
|
|
||||||
<h1 id="app-name">Hostsharing - Central Authentication Service (CAS)</h1>
|
|
||||||
</div>
|
|
||||||
<div id="content">
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
|
|
||||||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
|
|
||||||
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
|
|
||||||
<jsp:directive.include file="includes/top.jsp" />
|
|
||||||
<c:url var="url" value="/login">
|
|
||||||
<c:param name="service" value="${param.service}" />
|
|
||||||
<c:param name="renew" value="true" />
|
|
||||||
</c:url>
|
|
||||||
<div id="status" class="errors">
|
|
||||||
<h2><spring:message code="screen.service.sso.error.header" /></h2>
|
|
||||||
<p><spring:message code="screen.service.sso.error.message" arguments="${url}" /></p>
|
|
||||||
</div>
|
|
||||||
<jsp:directive.include file="includes/bottom.jsp" />
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
<jsp:directive.include file="includes/top.jsp" />
|
|
||||||
<div id="status" class="errors">
|
|
||||||
<h2><spring:message code="screen.service.error.header" /></h2>
|
|
||||||
<p><spring:message code="screen.service.error.message" /></p>
|
|
||||||
</div>
|
|
||||||
<jsp:directive.include file="includes/bottom.jsp" />
|
|
||||||
@ -1,358 +0,0 @@
|
|||||||
html,body {
|
|
||||||
margin:0;
|
|
||||||
padding:0;
|
|
||||||
border:0;
|
|
||||||
background:transparent;
|
|
||||||
color:#000;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
font:normal 76% Arial,Helvetica,Verdana,sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
acronym {
|
|
||||||
border-bottom:1px dotted #ccc;
|
|
||||||
cursor:help;
|
|
||||||
}
|
|
||||||
|
|
||||||
a img,#header img {
|
|
||||||
border:0;
|
|
||||||
display:block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bold {font-weight:bold;}
|
|
||||||
|
|
||||||
.important {color:#b00;}
|
|
||||||
|
|
||||||
.center {text-align:center;}
|
|
||||||
|
|
||||||
.right {text-align:right;}
|
|
||||||
|
|
||||||
.left {text-align:left;}
|
|
||||||
|
|
||||||
/*************************************** HEADER */
|
|
||||||
#header{
|
|
||||||
margin:0;
|
|
||||||
padding:0;
|
|
||||||
width:100%;
|
|
||||||
clear:both;
|
|
||||||
}
|
|
||||||
|
|
||||||
#header a {
|
|
||||||
display:block;
|
|
||||||
margin:0;
|
|
||||||
padding:0 0 0 3px;
|
|
||||||
text-decoration:none;
|
|
||||||
background-color:#b00;
|
|
||||||
color:#ffc;
|
|
||||||
font-size:1em;
|
|
||||||
line-height:19px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#header a.task {
|
|
||||||
float:right;
|
|
||||||
margin:0 0 0 1px;
|
|
||||||
padding:0 5px 0 20px;
|
|
||||||
line-height:20px;
|
|
||||||
text-decoration:none;
|
|
||||||
color:#ffc;
|
|
||||||
}
|
|
||||||
|
|
||||||
#header a:hover.task, #header a:focus.task {background-color:#c33 !important;}
|
|
||||||
|
|
||||||
#logo {
|
|
||||||
margin:10px 0 0 5%;
|
|
||||||
padding:0;
|
|
||||||
width:90%;
|
|
||||||
height:80px;
|
|
||||||
clear:both;
|
|
||||||
background: #005094 url(logo.png) no-repeat scroll;
|
|
||||||
}
|
|
||||||
|
|
||||||
#header h1 {
|
|
||||||
margin:20px 0 0 5%;
|
|
||||||
padding:0;
|
|
||||||
letter-spacing:1px;
|
|
||||||
background:transparent;
|
|
||||||
font-size:2.0em;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*************************************** CONTENT */
|
|
||||||
#content {
|
|
||||||
border-top:1px solid #fff; /* REMOVES VERTICAL MARGIN COLLAPSING */
|
|
||||||
margin:0 5%;
|
|
||||||
padding:0;
|
|
||||||
width:auto !important;
|
|
||||||
width /**/:100%;
|
|
||||||
clear:both;
|
|
||||||
}
|
|
||||||
|
|
||||||
#content .dataset {
|
|
||||||
margin:30px 0 0 0;
|
|
||||||
padding:10px;
|
|
||||||
border:1px solid #eee;
|
|
||||||
clear:both;
|
|
||||||
width:auto !important;
|
|
||||||
width /**/:100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
#content .dataset h2 {
|
|
||||||
position:relative;
|
|
||||||
top:-20px;
|
|
||||||
left:-20px;
|
|
||||||
width:350px;
|
|
||||||
margin:0;
|
|
||||||
padding:0 0 1px 5px;
|
|
||||||
border:1px solid #ccc;
|
|
||||||
background-color:#eee;
|
|
||||||
color:#066;
|
|
||||||
font-weight:bold;
|
|
||||||
font-size:1em;
|
|
||||||
line-height:1.3em;
|
|
||||||
}
|
|
||||||
|
|
||||||
#content .dataset .leftCol {
|
|
||||||
float:left;
|
|
||||||
width:50%;
|
|
||||||
min-width:50%;
|
|
||||||
margin:0;
|
|
||||||
padding:0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#appStatus .dataset .rightCol {
|
|
||||||
float:right;
|
|
||||||
width:50%;
|
|
||||||
}
|
|
||||||
|
|
||||||
html>body .clear:after {
|
|
||||||
content:" ";
|
|
||||||
display:block;
|
|
||||||
height:0px;
|
|
||||||
line-height:0px;
|
|
||||||
clear:both;
|
|
||||||
visibility:hidden; /* HIDES THE ELEMENT, BUT STILL TAKES UP SPACE */
|
|
||||||
}
|
|
||||||
|
|
||||||
#content p {
|
|
||||||
line-height:1.6em;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#content ul {
|
|
||||||
margin:0;
|
|
||||||
padding:0;
|
|
||||||
list-style:none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#content ul li {
|
|
||||||
padding-left:20px;
|
|
||||||
margin-top:.5em;
|
|
||||||
}
|
|
||||||
|
|
||||||
#content h2 {
|
|
||||||
margin:0;
|
|
||||||
padding:0;
|
|
||||||
font-size:1.8em;
|
|
||||||
}
|
|
||||||
|
|
||||||
#content h3 {
|
|
||||||
margin:0;
|
|
||||||
padding:0;
|
|
||||||
font-size:1.5em;
|
|
||||||
color:#333;
|
|
||||||
}
|
|
||||||
|
|
||||||
#content p.top {
|
|
||||||
text-align:right;
|
|
||||||
font:bold 1em Verdana,Helvetica,sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*************************************** FOOTER */
|
|
||||||
#footer {
|
|
||||||
margin:2em 5% 10px 5%;
|
|
||||||
padding:0;
|
|
||||||
clear:both;
|
|
||||||
}
|
|
||||||
|
|
||||||
#footer hr {
|
|
||||||
margin:0;
|
|
||||||
padding:0;
|
|
||||||
height:1px;
|
|
||||||
background:#ccc;
|
|
||||||
color:#ccc;
|
|
||||||
border:0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#footer p {
|
|
||||||
margin:0;
|
|
||||||
padding:0;
|
|
||||||
font-size:1em;
|
|
||||||
line-height:1.2em;
|
|
||||||
color:#999;
|
|
||||||
}
|
|
||||||
|
|
||||||
#footer p#copyright {margin-top:1em;}
|
|
||||||
|
|
||||||
/*************************************** LINK STYLES */
|
|
||||||
#content a:hover, #content a:focus, #content ul li a:hover, #content ul li a:focus,
|
|
||||||
#menu ul li a:hover, #menu ul li a:focus,
|
|
||||||
#footer a:hover, #footer a:focus {
|
|
||||||
background:transparent;
|
|
||||||
color:#b00;
|
|
||||||
text-decoration:underline;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*************************************** TABLE FORMATTING */
|
|
||||||
table {
|
|
||||||
border-right:solid 1px #999;
|
|
||||||
border-bottom:solid 1px #999;
|
|
||||||
background-color:#fff;
|
|
||||||
font-size:1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
th {
|
|
||||||
border-left:solid 1px #ccc;
|
|
||||||
border-top:solid 1px #ccc;
|
|
||||||
background-color:#eee;
|
|
||||||
color:#066;
|
|
||||||
font-weight:normal;
|
|
||||||
font-size:1em;
|
|
||||||
vertical-align:middle;
|
|
||||||
text-align:left;
|
|
||||||
padding:0 0 0 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
td {
|
|
||||||
border-left:solid 1px #ccc;
|
|
||||||
border-top:solid 1px #ccc;
|
|
||||||
font-size:1em;
|
|
||||||
padding:0 0 0 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*************************************** FORMS */
|
|
||||||
form {display:inline;}
|
|
||||||
|
|
||||||
input:focus, textarea:focus, select:focus {background:#fc3 !important;}
|
|
||||||
|
|
||||||
input.numeric {text-align:right;}
|
|
||||||
|
|
||||||
/*************************************** BUTTON STYLES */
|
|
||||||
#content a.button, #content a.button:link, #content a.button:hover, #content a.button:active, #content .button {
|
|
||||||
text-decoration:none;
|
|
||||||
background-color:#d0d0d0;
|
|
||||||
border:1px outset #d0d0d0;
|
|
||||||
color: #000;
|
|
||||||
padding:1px 1em;
|
|
||||||
font-size:1.2em;
|
|
||||||
line-height:1.2em;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*************************************** HELP */
|
|
||||||
#help {
|
|
||||||
background-color:#ffc;
|
|
||||||
border:1px solid #ccc;
|
|
||||||
margin:0 0 15px 0;
|
|
||||||
padding:0 0 10px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#help h4 {
|
|
||||||
margin:0 0 10px 0;
|
|
||||||
border-bottom:1px solid #ccc;
|
|
||||||
background-color:#fc3;
|
|
||||||
color:#b00;
|
|
||||||
font-size:1em;
|
|
||||||
font-weight:bold;
|
|
||||||
line-height:19px;
|
|
||||||
padding:0 0 0 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#help p {
|
|
||||||
margin:10px;
|
|
||||||
padding:0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* #help #closeHelp {display:none;} */
|
|
||||||
|
|
||||||
#help h4 a, #help h4 a:visited {
|
|
||||||
float:right;
|
|
||||||
margin:0;
|
|
||||||
padding:0 5px 0 20px;
|
|
||||||
text-decoration:none !important;
|
|
||||||
color:#ffc !important;
|
|
||||||
font-weight:normal;
|
|
||||||
line-height:19px;
|
|
||||||
}
|
|
||||||
|
|
||||||
fieldset {
|
|
||||||
border-top:solid 1px #ccc;
|
|
||||||
border-bottom:0;
|
|
||||||
border-right:0;
|
|
||||||
border-left:0;
|
|
||||||
margin:0;
|
|
||||||
padding:0;
|
|
||||||
padding-bottom: 1.5em;
|
|
||||||
}
|
|
||||||
form{
|
|
||||||
display: inline;
|
|
||||||
}
|
|
||||||
.accesskey {text-decoration:underline;}
|
|
||||||
fieldset div {padding-top:10px;}
|
|
||||||
|
|
||||||
legend {color:#066;}
|
|
||||||
|
|
||||||
input, select,textarea {
|
|
||||||
font-family:monospace;
|
|
||||||
font-size:11px;
|
|
||||||
margin:0;
|
|
||||||
padding:0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#content .button {
|
|
||||||
padding:3px 0px;
|
|
||||||
font-size:11px;
|
|
||||||
width:11em;
|
|
||||||
cursor:pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
label {
|
|
||||||
margin:0 5px 0 0;
|
|
||||||
font-weight:bold;
|
|
||||||
cursor:pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.required {background:#ffc;}
|
|
||||||
.important {color:#b00;font-family:monospace;font-weight:bold;font-size:1.2em;}
|
|
||||||
.evenrow {background-color:#eee;}
|
|
||||||
|
|
||||||
table .appHeadingRow th {
|
|
||||||
border-top:5px solid #ccc;
|
|
||||||
background-color:#666;
|
|
||||||
color:#fff;
|
|
||||||
text-align:left;
|
|
||||||
padding:0 0 0 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#login {float:left; margin:0 -296px 0 0; padding:15px; width:258px; min-height:15em; background:#eee; position:relative; border:0;}
|
|
||||||
#login h2 {border-bottom:1px solid #ddd; padding:3px 0; font:normal 400 17px Georgia, "Times New Roman", Times, serif; color:#333;}
|
|
||||||
#login label {font-size:11px;}
|
|
||||||
#login label span.accesskey {text-decoration:underline;}
|
|
||||||
#login input {letter-spacing:1px;}
|
|
||||||
#login .check input {position:relative; left:-4px; height:auto;}
|
|
||||||
#login .check label {float:none; xwidth:auto; line-height:1.8;}
|
|
||||||
#login .btn-row {position:relative; top:15px; padding-top:10px; border-top:1px solid #ddd;}
|
|
||||||
#login .btn-row {top:5px;} /* IE6 */
|
|
||||||
#login .btn-submit {float:none; clear:none; display:inline; letter-spacing:0;}
|
|
||||||
#login .btn-submit {background:#ffd;}
|
|
||||||
#login .btn-reset {float:none; clear:none; margin-left:5px; border:0; border-left:1px solid #ddd; background:transparent; color:#777; text-transform:lowercase; letter-spacing:0;}
|
|
||||||
|
|
||||||
/* MESSAGES --------------------------------- */
|
|
||||||
.info, .errors, .success {clear:both; margin:18px 0; padding:20px 20px 20px 100px; font-size:10px; line-height:1.5;}
|
|
||||||
#content .errors h2, #content .success h2 {font-family:Arial,Helvetica,Verdana,sans-serif; font-size:18px; line-height:48px; font-weight:400; margin:0 18px 0 0; padding:0;}
|
|
||||||
#content .success h2 {color: #008 !important;}
|
|
||||||
#content .errors h2 {color:#b00 !important;}
|
|
||||||
#content .success h2 {color:#060 !important;}
|
|
||||||
|
|
||||||
|
|
||||||
/* static messages */
|
|
||||||
#content #msg p {padding:0;}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.9 KiB |
1
hsacppcli/.gitignore
vendored
1
hsacppcli/.gitignore
vendored
@ -1 +0,0 @@
|
|||||||
/build
|
|
||||||
@ -1,70 +0,0 @@
|
|||||||
#
|
|
||||||
# (c) okunah gmbh
|
|
||||||
#
|
|
||||||
# name: Makefile
|
|
||||||
#
|
|
||||||
# description: description
|
|
||||||
#
|
|
||||||
# written by: Christof Donat
|
|
||||||
#
|
|
||||||
# changes:
|
|
||||||
# 05.11.11 (Christof Donat): created this file
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# includes
|
|
||||||
#
|
|
||||||
|
|
||||||
#
|
|
||||||
# defines
|
|
||||||
#
|
|
||||||
|
|
||||||
#
|
|
||||||
# rules
|
|
||||||
#
|
|
||||||
|
|
||||||
all: release
|
|
||||||
|
|
||||||
debug-test: debug
|
|
||||||
cd build/Debug; make test
|
|
||||||
|
|
||||||
debug: debug-env
|
|
||||||
cd build/Debug; make
|
|
||||||
|
|
||||||
debug-dir:
|
|
||||||
if [ ! -d build/Debug ]; then mkdir -p build/Debug; fi
|
|
||||||
|
|
||||||
debug-env: debug-dir
|
|
||||||
cd build/Debug; cmake -DCMAKE_BUILD_TYPE="Debug" ../../hsadminc/
|
|
||||||
|
|
||||||
test: release
|
|
||||||
cd build/Release; make test
|
|
||||||
|
|
||||||
release: release-env
|
|
||||||
cd build/Release; make
|
|
||||||
|
|
||||||
release-env: release-dir
|
|
||||||
cd build/Release; cmake -DCMAKE_BUILD_TYPE="Release" ../../hsadminc/
|
|
||||||
|
|
||||||
release-dir:
|
|
||||||
if [ ! -d build/Release ]; then mkdir -p build/Release; fi
|
|
||||||
|
|
||||||
small-test: small
|
|
||||||
cd build/MinSizeRel; make test
|
|
||||||
|
|
||||||
small: small-env
|
|
||||||
cd build/MinSizeRel; make
|
|
||||||
|
|
||||||
small-env: small-dir
|
|
||||||
cd build/MinSizeRel; cmake -DCMAKE_BUILD_TYPE="MinSizeRel" ../../hsadminc/
|
|
||||||
|
|
||||||
small-dir:
|
|
||||||
if [ ! -d build/MinSizeRel ]; then mkdir -p build/MinSizeRel; fi
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -rf build
|
|
||||||
|
|
||||||
# end Makefile
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,129 +0,0 @@
|
|||||||
PROJECT( hsadminc )
|
|
||||||
CMAKE_MINIMUM_REQUIRED( VERSION 2.6 )
|
|
||||||
|
|
||||||
#
|
|
||||||
# look for packages needed for the build to succeed
|
|
||||||
#
|
|
||||||
|
|
||||||
# find boost libraries
|
|
||||||
SET(Boost_USE_MULTITHREADED ON)
|
|
||||||
SET(Boost_USE_STATIC_RUNTIME OFF)
|
|
||||||
FIND_PACKAGE( Boost 1.44 REQUIRED COMPONENTS date_time filesystem iostreams regex system unit_test_framework thread )
|
|
||||||
|
|
||||||
# find doxygen
|
|
||||||
FIND_PACKAGE( Doxygen 1.7.3 )
|
|
||||||
|
|
||||||
# find GnuTLS
|
|
||||||
FIND_PACKAGE( GnuTLS 2.8.6 REQUIRED )
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# set compiler and linker flags
|
|
||||||
#
|
|
||||||
|
|
||||||
# compiler
|
|
||||||
SET( CMAKE_CXX_FLAGS_DEBUG "-g3 -O0" )
|
|
||||||
SET( CMAKE_CXX_FLAGS_RELEASE "-O3" )
|
|
||||||
SET( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g3 -O3" )
|
|
||||||
SET( CMAKE_CXX_FLAGS_MINSIZEREL "-Os" )
|
|
||||||
|
|
||||||
# gcc specific
|
|
||||||
IF( CMAKE_COMPILER_IS_GNUCC )
|
|
||||||
SET( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wold-style-cast -pedantic -Wall -Wextra -Winit-self -Wshadow -Wconversion -Wlogical-op -Wnormalized=nfc -Winline -std=c++0x" )
|
|
||||||
SET( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++0x" )
|
|
||||||
SET( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -std=c++0x" )
|
|
||||||
SET( CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -std=c++0x" )
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
#linker
|
|
||||||
SET( CMAKE_LINK_FLAGS_DEBUG "-g -O0" )
|
|
||||||
SET( CMAKE_LINK_FLAGS_RELEASE "-O3" )
|
|
||||||
SET( CMAKE_LINK_FLAGS_RELWITHDEBINFO "-g -O3" )
|
|
||||||
SET( CMAKE_LINK_FLAGS_MINSIZEREL "-O3" )
|
|
||||||
|
|
||||||
# GNU ld specific
|
|
||||||
IF( CMAKE_COMPILER_IS_GNUCC )
|
|
||||||
SET( CMAKE_LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_RELEASE} --relax" )
|
|
||||||
SET( CMAKE_LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE} --relax" )
|
|
||||||
SET( CMAKE_LINK_FLAGS_RELWITHDEBINFO "${CMAKE_LINK_FLAGS_RELWITHDEBINFO} --relax" )
|
|
||||||
SET( CMAKE_LINK_FLAGS_MINSIZEREL "${CMAKE_LINK_FLAGS_MINSIZEREL} -s --gc-sections --relax" )
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
# build the release as default
|
|
||||||
SET( CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS_RELEASE} )
|
|
||||||
SET( CMAKE_LINK_FLAGS ${CMAKE_LINK_FLAGS_RELEASE} )
|
|
||||||
|
|
||||||
# make sure the boost include files are available
|
|
||||||
INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} )
|
|
||||||
# all libs that will be linked to hsadminc
|
|
||||||
SET( HSADMINC_LIB ${Boost_LIBRARIES} gnutls )
|
|
||||||
|
|
||||||
# now this is where the source is
|
|
||||||
ADD_SUBDIRECTORY( source )
|
|
||||||
|
|
||||||
# packaging
|
|
||||||
IF( ${UNIX} )
|
|
||||||
SET( CPACK_GNERATOR "DEB;RPM;" )
|
|
||||||
SET( CPACK_PACKAGE_DESCRIPTION "hsadmin command line client" )
|
|
||||||
SET( CPACK_PACKAGE_DESCRIPTION_SUMMARY "a command line tool to access servers of the configuration tool hsadmin developed by Hostsharing e.G." )
|
|
||||||
SET( CPACK_PACKAGE_NAME "hsadminc" )
|
|
||||||
|
|
||||||
SET( CPACK_DEBIAN_PACKAGE_DEPENDS "boost (>= 1.44), gnutls (>= 2.8.6)" )
|
|
||||||
SET( CPACK_PACKAGE_CONTACT "Christof Donat" )
|
|
||||||
SET( CPACK_PACKAGE_VENDOR "Hostsharing e.G." )
|
|
||||||
SET( CPACK_PACKAGE_VERSION_MAJOR "0" )
|
|
||||||
SET( CPACK_PACKAGE_VERSION_MINOR "0" )
|
|
||||||
SET( CPACK_PACKAGE_VERSION_PATCH "1" )
|
|
||||||
SET( VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}" )
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
# currently WIN32 is not supported
|
|
||||||
#IF( ${WIN32} )
|
|
||||||
# SET( CPACK_GNERATOR "NSIS;" )
|
|
||||||
# SET( CPACK_NSIS_MUI_ICON "" )
|
|
||||||
# SET( CPACK_NSIS_MUI_UNIICON "" )
|
|
||||||
# SET( CPACK_PACKAGE_ICON "" )
|
|
||||||
# SET( CPACK_NSIS_EXTRA_INSTALL_COMMANDS "" )
|
|
||||||
# SET( CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "" )
|
|
||||||
# SET( CPACK_NSIS_COMPRESSOR "" )
|
|
||||||
# SET( CPACK_NSIS_MODIFY_PATH "" )
|
|
||||||
# SET( CPACK_NSIS_DISPLAY_NAME "" )
|
|
||||||
# SET( CPACK_NSIS_INSTALLED_ICON_NAME "" )
|
|
||||||
# SET( CPACK_NSIS_HELP_LINK "" )
|
|
||||||
# SET( CPACK_NSIS_URL_INFO_ABOUT "" )
|
|
||||||
# SET( CPACK_NSIS_CONTACT "" )
|
|
||||||
# SET( CPACK_NSIS_CREATE_ICONS_EXTRA "" )
|
|
||||||
# SET( CPACK_NSIS_DELETE_ICONS_EXTRA "" )
|
|
||||||
# SET( CPACK_NSIS_MENU_LINKS "" )
|
|
||||||
# SET( CPACK_NSIS_MUI_FINISHPAGE_RUN "" )
|
|
||||||
#ENDIF()
|
|
||||||
|
|
||||||
# currently OSX is not supported
|
|
||||||
#IF( ${APPLE} )
|
|
||||||
# SET( CPACK_GNERATOR "MACOSX_BUNDLE;" )
|
|
||||||
# SET( CPACK_PACKAGE_FILE_NAME "" )
|
|
||||||
# SET( CPACK_PACKAGE_ICON "" )
|
|
||||||
# SET( CPACK_BUNDLE_NAME "" )
|
|
||||||
# SET( CPACK_BUNDLE_ICON "" )
|
|
||||||
# SET( CPACK_BUNDLE_PLIST "" )
|
|
||||||
# SET( CPACK_BUNDLE_STARTUP_COMMAND "" )
|
|
||||||
#ENDIF()
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# doxygen documentation
|
|
||||||
#
|
|
||||||
|
|
||||||
CONFIGURE_FILE( doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile )
|
|
||||||
ADD_CUSTOM_TARGET( doxygen ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile )
|
|
||||||
SET_PROPERTY( DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CKEAN_FILES doc )
|
|
||||||
GET_TARGET_PROPERTY( DOC_TARGET doc TYPE )
|
|
||||||
IF( NOT DOC_TARGET )
|
|
||||||
ADD_CUSTOM_TARGET( doc )
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
ADD_DEPENDENCIES( doc doxygen )
|
|
||||||
|
|
||||||
SET( DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}-${VERSION}" )
|
|
||||||
INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION DOC_PATH )
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 7.4 KiB |
@ -1,11 +0,0 @@
|
|||||||
CMAKE_MINIMUM_REQUIRED( VERSION 2.6 )
|
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} )
|
|
||||||
|
|
||||||
SET( HSADMINC_SRC abstractcmdlineparser.cpp cmdlineparser.cpp configfile.cpp hsadminc.cpp httpclient.cpp logger.cpp sslclient.cpp transaction.cpp xmlparser.cpp )
|
|
||||||
|
|
||||||
ADD_EXECUTABLE( hsadminc ${HSADMINC_SRC} )
|
|
||||||
TARGET_LINK_LIBRARIES( hsadminc ${HSADMINC_LIB} )
|
|
||||||
|
|
||||||
INSTALL( TARGETS hsadminc RUNTIME DESTINATION bin )
|
|
||||||
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Christof Donat *
|
|
||||||
* cdonat@gmx.de *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#include "abstractcmdlineparser.h"
|
|
||||||
|
|
||||||
@ -1,417 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Christof Donat *
|
|
||||||
* cdonat@gmx.de *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
|
|
||||||
#include <vector>
|
|
||||||
#include <string>
|
|
||||||
#include "logger.h"
|
|
||||||
#include <boost/lexical_cast.hpp>
|
|
||||||
#include <boost/shared_ptr.hpp>
|
|
||||||
#include <boost/scoped_ptr.hpp>
|
|
||||||
#include <boost/algorithm/string.hpp>
|
|
||||||
|
|
||||||
/** abstractcommandlineparser holds some basic stuff for making commandline-Parsers easier. */
|
|
||||||
|
|
||||||
namespace abstractcommandlineparser {
|
|
||||||
|
|
||||||
#ifndef HSADMIN_ABSTRACTCMDLINEPARSER
|
|
||||||
#define HSADMIN_ABSTRACTCMDLINEPARSER
|
|
||||||
|
|
||||||
using std::vector;
|
|
||||||
using std::string;
|
|
||||||
using boost::shared_ptr;
|
|
||||||
using boost::scoped_ptr;
|
|
||||||
using boost::starts_with;
|
|
||||||
using boost::erase_first;
|
|
||||||
|
|
||||||
/** \brief template for Commandline-Parser
|
|
||||||
*
|
|
||||||
* Has two Parameters:
|
|
||||||
* - class Options: This class must provide a method 'parseThis()'. - see template CmdLineOption for an example
|
|
||||||
* - class parseResult: a shared pointer to an Object of this class is passed to the Options.
|
|
||||||
*/
|
|
||||||
template<class Options,class parserResult> class CmdLineParser {
|
|
||||||
public:
|
|
||||||
/** \brief this actually not only instatiates the parser but also parses Parameters.
|
|
||||||
*
|
|
||||||
* takes the Options in a vector<string>
|
|
||||||
*/
|
|
||||||
CmdLineParser(vector<string> options) : m_parsed(new parserResult), m_parseSuccessful(false) {
|
|
||||||
Options o;
|
|
||||||
while( options.size() > 0 )
|
|
||||||
if( !(this->m_parseSuccessful = o.parseThis(options,m_parsed)) )
|
|
||||||
return;
|
|
||||||
};
|
|
||||||
|
|
||||||
//! has the parser been successful?
|
|
||||||
inline bool operator!() { return !this->m_parseSuccessful; }
|
|
||||||
|
|
||||||
protected:
|
|
||||||
shared_ptr<parserResult> m_parsed;
|
|
||||||
bool m_parseSuccessful;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/** \brief base template for Option classes
|
|
||||||
*
|
|
||||||
* usually you would use one of the many specialisations
|
|
||||||
* has four parameters:
|
|
||||||
* - bool hasLongName: the Parameter has a long name (e.g. --verbose)
|
|
||||||
* - bool hasShortName: the Parameter has a short name (e.g. -v)
|
|
||||||
* - bool hasParameter: the Parameter is followed by another Parameter that belongs to it
|
|
||||||
* - class parseResult: takes the Parse results
|
|
||||||
*
|
|
||||||
* You should implement a protected virtual method 'bool handle(string ¶meter, shared_ptr<parseResult> result)'
|
|
||||||
* if you have 'hasParameter' set to true or 'bool handle(shared_ptr<parseResult> result)' otherwise. There you
|
|
||||||
* can actually store your values in your parseResult.
|
|
||||||
*/
|
|
||||||
template <bool hasLongName, bool hasShortName, bool hasParameter,class parseResult> class CmdLineOption {
|
|
||||||
public:
|
|
||||||
//! the actual parser function.
|
|
||||||
bool parseThis(vector<string>& options, shared_ptr<parseResult> result) {};
|
|
||||||
};
|
|
||||||
|
|
||||||
/** \brief base template for Option classes - specialisation
|
|
||||||
*
|
|
||||||
* this is the specialisation for Parameters that do have long and short names as well as a value.
|
|
||||||
*
|
|
||||||
* You should implement a protected virtual method
|
|
||||||
* 'bool handle(string ¶meter, shared_ptr<parseResult> result)'.
|
|
||||||
* There you can actually store your values in your parseResult.
|
|
||||||
*/
|
|
||||||
template <class parseResult> class CmdLineOption<true, true, true,parseResult> {
|
|
||||||
public:
|
|
||||||
//! the actual parser function.
|
|
||||||
bool parseThis(vector<string>& options, shared_ptr<parseResult> result) {
|
|
||||||
bool rval = false;
|
|
||||||
if( starts_with(options[0], "-"+m_shortName) ) {
|
|
||||||
if( rval = this->handle(options[1],result) ) {
|
|
||||||
if( options[0] == "-"+m_shortName)
|
|
||||||
options.erase(options.begin(),options.begin()+2);
|
|
||||||
else {
|
|
||||||
options.erase(options.begin()+1);
|
|
||||||
erase_first(options[0], m_shortName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if( starts_with(options[0], "--"+m_longName+m_parameterSeparator) ) {
|
|
||||||
string p = options[0].substr(m_longName.size()+m_parameterSeparator.size()+2);
|
|
||||||
if( rval = this->handle(p,result) )
|
|
||||||
options.erase(options.begin());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return rval;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
string m_longName;
|
|
||||||
string m_shortName;
|
|
||||||
string m_parameterSeparator;
|
|
||||||
|
|
||||||
//! the handle function.
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parseResult> result) { return true; };
|
|
||||||
};
|
|
||||||
|
|
||||||
/** \brief base template for Option classes - specialisation
|
|
||||||
*
|
|
||||||
* this is the specialisation for Parameters that do have long and short names but no value.
|
|
||||||
*
|
|
||||||
* You should implement a protected virtual method
|
|
||||||
* 'bool handle(shared_ptr<parseResult> result)'.
|
|
||||||
* There you can actually store your values in your parseResult.
|
|
||||||
*/
|
|
||||||
template <class parseResult> class CmdLineOption<true, true, false,parseResult> {
|
|
||||||
public:
|
|
||||||
//! the actual parser function.
|
|
||||||
bool parseThis(vector<string>& options, shared_ptr<parseResult> result) {
|
|
||||||
bool rval = false;
|
|
||||||
if( options[0] == "-"+m_shortName || options[0] == "--"+m_longName ) {
|
|
||||||
if( rval = this->handle(result) )
|
|
||||||
options.erase(options.begin());
|
|
||||||
} else if( starts_with(options[0], "-"+m_shortName) && (rval = this->handle(result)) )
|
|
||||||
erase_first(options[0], m_shortName);
|
|
||||||
return rval;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
string m_longName;
|
|
||||||
string m_shortName;
|
|
||||||
|
|
||||||
//! the handle function.
|
|
||||||
virtual bool handle(shared_ptr<parseResult> result) { return true; };
|
|
||||||
};
|
|
||||||
|
|
||||||
/** \brief base template for Option classes - specialisation
|
|
||||||
*
|
|
||||||
* this is the specialisation for Parameters that only have a long name and a value but no short name.
|
|
||||||
*
|
|
||||||
* You should implement a protected virtual method
|
|
||||||
* 'bool handle(string ¶meter, shared_ptr<parseResult> result)'.
|
|
||||||
* There you can actually store your values in your parseResult.
|
|
||||||
*/
|
|
||||||
template <class parseResult> class CmdLineOption<true, false, true,parseResult> {
|
|
||||||
public:
|
|
||||||
//! the actual parser function.
|
|
||||||
bool parseThis(vector<string>& options, shared_ptr<parseResult> result) {
|
|
||||||
bool rval = false;
|
|
||||||
if( starts_with(options[0], "--"+m_longName+m_parameterSeparator) ) {
|
|
||||||
string p = options[0].substr(m_longName.size()+m_parameterSeparator.size()+2);
|
|
||||||
if ( rval = this->handle(p, result) )
|
|
||||||
options.erase(options.begin());
|
|
||||||
}
|
|
||||||
return rval;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
string m_longName;
|
|
||||||
string m_parameterSeparator;
|
|
||||||
|
|
||||||
//! the handle function.
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parseResult> result) { return true; };
|
|
||||||
};
|
|
||||||
|
|
||||||
/** \brief base template for Option classes - specialisation
|
|
||||||
*
|
|
||||||
* this is the specialisation for Parameters that only have a long name but no value or short name.
|
|
||||||
*
|
|
||||||
* You should implement a protected virtual method
|
|
||||||
* 'bool handle(shared_ptr<parseResult> result)'.
|
|
||||||
* There you can actually store your values in your parseResult.
|
|
||||||
*/
|
|
||||||
template <class parseResult> class CmdLineOption<true, false, false,parseResult> {
|
|
||||||
public:
|
|
||||||
//! the actual parser function.
|
|
||||||
bool parseThis(vector<string>& options, shared_ptr<parseResult> result) {
|
|
||||||
bool rval = false;
|
|
||||||
if( options[0] == "--"+m_longName && (rval = this->handle(result)) )
|
|
||||||
options.erase(options.begin());
|
|
||||||
return rval;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
string m_longName;
|
|
||||||
|
|
||||||
//! the handle function.
|
|
||||||
virtual bool handle(shared_ptr<parseResult> result) { return true; };
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/** \brief base template for Option classes - specialisation
|
|
||||||
*
|
|
||||||
* this is the specialisation for Parameters that only have short name and a value but no long name.
|
|
||||||
*
|
|
||||||
* You should implement a protected virtual method
|
|
||||||
* 'bool handle(string ¶meter, shared_ptr<parseResult> result)'.
|
|
||||||
* There you can actually store your values in your parseResult.
|
|
||||||
*/
|
|
||||||
template <class parseResult> class CmdLineOption<false, true, true,parseResult> {
|
|
||||||
public:
|
|
||||||
//! the actual parser function.
|
|
||||||
bool parseThis(vector<string>& options, shared_ptr<parseResult> result) {
|
|
||||||
bool rval = false;
|
|
||||||
if( starts_with(options[0], "-"+m_shortName) && (rval = this->handle(options[1],result)) ) {
|
|
||||||
if( options[0] == "-"+m_shortName)
|
|
||||||
options.erase(options.begin(),options.begin()+2);
|
|
||||||
else {
|
|
||||||
options.erase(options.begin()+1);
|
|
||||||
erase_first(options[0], m_shortName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return rval;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
string m_shortName;
|
|
||||||
|
|
||||||
//! the handle function.
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parseResult> result) { return true; };
|
|
||||||
};
|
|
||||||
|
|
||||||
/** \brief base template for Option classes - specialisation
|
|
||||||
*
|
|
||||||
* this is the specialisation for Parameters that only have short name bot no value or long name.
|
|
||||||
*
|
|
||||||
* You should implement a protected virtual method
|
|
||||||
* 'bool handle(shared_ptr<parseResult> result)'.
|
|
||||||
* There you can actually store your values in your parseResult.
|
|
||||||
*/
|
|
||||||
template <class parseResult> class CmdLineOption<false, true, false,parseResult> {
|
|
||||||
public:
|
|
||||||
//! the actual parser function.
|
|
||||||
bool parseThis(vector<string>& options, shared_ptr<parseResult> result) {
|
|
||||||
bool rval = false;
|
|
||||||
if( starts_with(options[0], "-"+m_shortName) && (rval = this->handle(result)) ) {
|
|
||||||
if( options[0] == "-"+m_shortName )
|
|
||||||
options.erase(options.begin());
|
|
||||||
else
|
|
||||||
erase_first(options[0], m_shortName);
|
|
||||||
}
|
|
||||||
return rval;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
string m_shortName;
|
|
||||||
|
|
||||||
//! the handle function.
|
|
||||||
virtual bool handle(shared_ptr<parseResult> result) { return true; };
|
|
||||||
};
|
|
||||||
|
|
||||||
/** \brief base template for Option classes - specialisation
|
|
||||||
*
|
|
||||||
* this is the specialisation for Parameters that only have a value but neither a long or short name.
|
|
||||||
*
|
|
||||||
* You should implement a protected virtual method
|
|
||||||
* 'bool handle(string ¶meter, shared_ptr<parseResult> result)'.
|
|
||||||
* There you can actually store your values in your parseResult.
|
|
||||||
*/
|
|
||||||
template <class parseResult> class CmdLineOption<false, false, true,parseResult> {
|
|
||||||
public:
|
|
||||||
//! the actual parser function.
|
|
||||||
bool parseThis(vector<string>& options, shared_ptr<parseResult> result) {
|
|
||||||
bool rval = false;
|
|
||||||
if( !starts_with(options[0], "-") && (rval = this->handle(options[0],result)) )
|
|
||||||
options.erase(options.begin());
|
|
||||||
return rval;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
//! the handle function.
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parseResult> result) { return true; };
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/** \brief base template for Option classes - specialisation
|
|
||||||
*
|
|
||||||
* this is the specialisation for Parameters that neither have a value, a long or short name.
|
|
||||||
*
|
|
||||||
* You should implement a protected virtual method
|
|
||||||
* 'bool handle(shared_ptr<parseResult> result)'.
|
|
||||||
* There you can actually store your values in your parseResult.
|
|
||||||
*/
|
|
||||||
template <class parseResult> class CmdLineOption<false, false, false,parseResult> {
|
|
||||||
public:
|
|
||||||
//! the actual parser function.
|
|
||||||
bool parseThis(vector<string>& options, shared_ptr<parseResult> result) {
|
|
||||||
bool rval = false;
|
|
||||||
if( !starts_with(options[0], "-") && (rval = this->handle(result)) )
|
|
||||||
options.erase(options.begin());
|
|
||||||
return rval;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
//! the handle function.
|
|
||||||
virtual bool handle(shared_ptr<parseResult> result) { return true; };
|
|
||||||
};
|
|
||||||
|
|
||||||
//! just needed for typelists
|
|
||||||
class nullType {};
|
|
||||||
|
|
||||||
//! typelist for multiple Options parser
|
|
||||||
template<class CAR, class CDR> class typelist {
|
|
||||||
public:
|
|
||||||
typedef CAR car;
|
|
||||||
typedef CDR cdr;
|
|
||||||
};
|
|
||||||
|
|
||||||
/** \brief A Commandline-Option for CmdLineParser that works with a typelist of Options.
|
|
||||||
*
|
|
||||||
* this is meant to combine multiple Parameters in a typelist to build a complex Command Line parser
|
|
||||||
*/
|
|
||||||
template<class tl, class parseResult> class CmdLineOptionList : public CmdLineOption<false,false,false,parseResult> {
|
|
||||||
public:
|
|
||||||
//! the actual parser function.
|
|
||||||
bool parseThis(vector<string>& options, shared_ptr<parseResult> result) {
|
|
||||||
return m_first.parseThis(options,result) || m_second.parseThis(options,result);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
typename tl::car m_first;
|
|
||||||
CmdLineOptionList<typename tl::cdr,parseResult> m_second;
|
|
||||||
};
|
|
||||||
|
|
||||||
/** \brief specialisation for empty type list
|
|
||||||
*/
|
|
||||||
template<class parseResult> class CmdLineOptionList<nullType,parseResult> : public CmdLineOption<false,false,false,parseResult> {
|
|
||||||
public:
|
|
||||||
//! the actual parser function; always returns false.
|
|
||||||
bool parseThis(vector<string>& options, shared_ptr<parseResult> result) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
#define Parameterlist1(t1) \
|
|
||||||
abstractcommandlineparser::typelist<t1,abstractcommandlineparser::nullType>
|
|
||||||
#define Parameterlist2(t1,t2) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist1(t2) >
|
|
||||||
#define Parameterlist3(t1,t2,t3) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist2(t2,t3) >
|
|
||||||
#define Parameterlist4(t1,t2,t3,t4) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist3(t2,t3,t4) >
|
|
||||||
#define Parameterlist5(t1,t2,t3,t4,t5) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist4(t2,t3,t4,t5) >
|
|
||||||
#define Parameterlist6(t1,t2,t3,t4,t5,t6) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist5(t2,t3,t4,t5,t6) >
|
|
||||||
#define Parameterlist7(t1,t2,t3,t4,t5,t6,t7) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist6(t2,t3,t4,t5,t6,t7) >
|
|
||||||
#define Parameterlist8(t1,t2,t3,t4,t5,t6,t7,t8) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist7(t2,t3,t4,t5,t6,t7,t8) >
|
|
||||||
#define Parameterlist9(t1,t2,t3,t4,t5,t6,t7,t8,t9) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist8(t2,t3,t4,t5,t6,t7,t8,t9) >
|
|
||||||
#define Parameterlist10(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist9(t2,t3,t4,t5,t6,t7,t8,t9,t10) >
|
|
||||||
#define Parameterlist11(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist10(t2,t3,t4,t5,t6,t7,t8,t9,t10,t11) >
|
|
||||||
#define Parameterlist12(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist11(t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12) >
|
|
||||||
#define Parameterlist13(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist12(t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13) >
|
|
||||||
#define Parameterlist14(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist13(t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14) >
|
|
||||||
#define Parameterlist15(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist14(t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15) >
|
|
||||||
#define Parameterlist16(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist15(t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16) >
|
|
||||||
#define Parameterlist17(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist16(t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17) >
|
|
||||||
#define Parameterlist18(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist17(t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18) >
|
|
||||||
#define Parameterlist19(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist18(t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19) >
|
|
||||||
#define Parameterlist20(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist19(t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20) >
|
|
||||||
#define Parameterlist21(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist20(t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21) >
|
|
||||||
#define Parameterlist22(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist21(t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22) >
|
|
||||||
#define Parameterlist23(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist22(t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23) >
|
|
||||||
#define Parameterlist24(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24) \
|
|
||||||
abstractcommandlineparser::typelist<t1,Parameterlist23(t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24) >
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
template<class Options,class parseResult> class CmdLineParser;
|
|
||||||
template <bool hasLongName, bool hasShortName, bool hasParameter,class parseResult> class CmdLineOption;
|
|
||||||
class nullType;
|
|
||||||
template<class CAR, class CDR> class typelist;
|
|
||||||
template<class tl, class parseResult> class CmdLineOptionList;
|
|
||||||
|
|
||||||
#endif /* HSADMIN_ABSTRACTCMDLINEPARSER */
|
|
||||||
};
|
|
||||||
@ -1,772 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Christof Donat *
|
|
||||||
* cdonat@gmx.de *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#include <boost/regex.hpp>
|
|
||||||
#include <boost/lexical_cast.hpp>
|
|
||||||
#include <boost/algorithm/string.hpp>
|
|
||||||
#include <boost/format.hpp>
|
|
||||||
|
|
||||||
#include <iostream>
|
|
||||||
#include <sstream>
|
|
||||||
#include <fstream>
|
|
||||||
|
|
||||||
#include "cmdlineparser.h"
|
|
||||||
#include "logger.h"
|
|
||||||
|
|
||||||
#include <termios.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
namespace commandline {
|
|
||||||
|
|
||||||
using std::cout;
|
|
||||||
using std::cin;
|
|
||||||
using std::flush;
|
|
||||||
using std::ifstream;
|
|
||||||
using std::ostringstream;
|
|
||||||
|
|
||||||
using boost::lexical_cast;
|
|
||||||
using boost::bad_lexical_cast;
|
|
||||||
using boost::shared_ptr;
|
|
||||||
using boost::scoped_ptr;
|
|
||||||
using boost::starts_with;
|
|
||||||
using boost::erase_first;
|
|
||||||
|
|
||||||
// dynamic cast needs this
|
|
||||||
|
|
||||||
vector<string> callParameter::parseDisplayspec() {
|
|
||||||
vector<string> rval;
|
|
||||||
boost::regex pattern("\\$\\{([^\\}]*)\\}");
|
|
||||||
boost::sregex_iterator end;
|
|
||||||
|
|
||||||
for(boost::sregex_iterator i(this->m_display.begin(),this->m_display.end(),pattern); i != end; i++ )
|
|
||||||
rval.insert(rval.end(),(*i)[1]);
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG,"have parsed displayspec Parameter '"+this->m_display+"'");
|
|
||||||
|
|
||||||
return rval;
|
|
||||||
}
|
|
||||||
string callParameter::evalDisplay(const map<string, string> &values) {
|
|
||||||
string rval = this->m_display;
|
|
||||||
string::size_type pos;
|
|
||||||
|
|
||||||
for( map<string,string>::const_iterator i = values.begin(); i != values.end(); i++ ) {
|
|
||||||
string pattstring = "${"+i->first+"}";
|
|
||||||
while( (pos = rval.find(pattstring,0)) != string::npos ) rval.replace(pos,pattstring.length(),i->second);
|
|
||||||
}
|
|
||||||
|
|
||||||
while( (pos = rval.find("\\n",0)) != string::npos ) rval.replace(pos,2,"\n");
|
|
||||||
while( (pos = rval.find("\\t",0)) != string::npos ) rval.replace(pos,2,"\t");
|
|
||||||
while( (pos = rval.find("\\r",0)) != string::npos ) rval.replace(pos,2,"\r");
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG,"have evaluated displayspec Parameter '"+this->m_display+"': '"+rval+"'");
|
|
||||||
|
|
||||||
return rval;
|
|
||||||
}
|
|
||||||
|
|
||||||
string setParameter::toXML(string &username, shared_ptr< ::ConfigFileParser > cfgfile) {
|
|
||||||
string rpccall = "<struct>";
|
|
||||||
rpccall += "<member><name>property</name><value>"+m_property+"</value></member>";
|
|
||||||
rpccall += "<member><name>value</name><value>"+m_value+"</value></member>";
|
|
||||||
rpccall += "</struct>";
|
|
||||||
return rpccall;
|
|
||||||
}
|
|
||||||
string whereParameter::toXML(string &username, shared_ptr< ::ConfigFileParser > cfgfile) {
|
|
||||||
string rpccall = "<struct>";
|
|
||||||
rpccall += "<member><name>property</name><value>"+m_property+"</value></member>";
|
|
||||||
rpccall += "<member><name>value</name><value>"+m_pattern+"</value></member>";
|
|
||||||
rpccall += "</struct>";
|
|
||||||
return rpccall;
|
|
||||||
}
|
|
||||||
string orderParameter::toXML(string &username, shared_ptr< ::ConfigFileParser > cfgfile) {
|
|
||||||
string rpccall = "<struct>";
|
|
||||||
rpccall += "<member><name>property</name><value>"+m_property+"</value></member>";
|
|
||||||
rpccall += "<member><name>ascending</name><value><boolean>";
|
|
||||||
rpccall += string((m_ascending?"1":"0"))+"</boolean></value></member>";
|
|
||||||
rpccall += "</struct>";
|
|
||||||
return rpccall;
|
|
||||||
}
|
|
||||||
string callParameter::toXML(string &username, shared_ptr< ::ConfigFileParser > cfgfile) {
|
|
||||||
string rpccall = "<struct>";
|
|
||||||
rpccall += "<member>";
|
|
||||||
rpccall += "<name>module</name>";
|
|
||||||
rpccall += "<value>"+m_module+"</value>";
|
|
||||||
rpccall += "</member>";
|
|
||||||
rpccall += "<member>";
|
|
||||||
rpccall += "<name>function</name>";
|
|
||||||
rpccall += "<value>"+m_function+"</value>";
|
|
||||||
rpccall += "</member>";
|
|
||||||
|
|
||||||
if( m_force ) {
|
|
||||||
rpccall += "<member>";
|
|
||||||
rpccall += "<name>force</name>";
|
|
||||||
rpccall += "<value><boolean>1</boolean></value>";
|
|
||||||
rpccall += "</member>";
|
|
||||||
}
|
|
||||||
if( m_ignoreerror ) {
|
|
||||||
rpccall += "<member>";
|
|
||||||
rpccall += "<name>ignoreerror</name>";
|
|
||||||
rpccall += "<value><boolean>1</boolean></value>";
|
|
||||||
rpccall += "</member>";
|
|
||||||
}
|
|
||||||
|
|
||||||
// read
|
|
||||||
vector<string> reads = parseDisplayspec();
|
|
||||||
|
|
||||||
if(reads.size()) {
|
|
||||||
rpccall += "<member>";
|
|
||||||
rpccall += "<name>read</name>";
|
|
||||||
rpccall += "<value><array><data>";
|
|
||||||
for(vector<string>::iterator j = reads.begin(); j != reads.end(); j++ )
|
|
||||||
rpccall += "<value>"+(*j)+"</value>";
|
|
||||||
rpccall += "</data></array></value>";
|
|
||||||
rpccall += "</member>";
|
|
||||||
}
|
|
||||||
|
|
||||||
if( m_where.size() ) {
|
|
||||||
rpccall += "<member>";
|
|
||||||
rpccall += "<name>where</name>";
|
|
||||||
rpccall += "<value><array><data>";
|
|
||||||
for(vector<shared_ptr<whereParameter> >::iterator j = m_where.begin(); j != m_where.end(); j++ )
|
|
||||||
rpccall += "<value>"+((*j)->toXML(username,cfgfile))+"</value>";
|
|
||||||
rpccall += "</data></array></value>";
|
|
||||||
rpccall += "</member>";
|
|
||||||
}
|
|
||||||
|
|
||||||
if( m_set.size() ) {
|
|
||||||
rpccall += "<member>";
|
|
||||||
rpccall += "<name>set</name>";
|
|
||||||
rpccall += "<value><array><data>";
|
|
||||||
for(vector<shared_ptr<setParameter> >::iterator j = m_set.begin(); j != m_set.end(); j++ )
|
|
||||||
rpccall += "<value>"+((*j)->toXML(username,cfgfile))+"</value>";
|
|
||||||
rpccall += "</data></array></value>";
|
|
||||||
rpccall += "</member>";
|
|
||||||
}
|
|
||||||
|
|
||||||
if( m_order.size() ) {
|
|
||||||
rpccall += "<member>";
|
|
||||||
rpccall += "<name>order</name>";
|
|
||||||
rpccall += "<value><array><data>";
|
|
||||||
for(vector<shared_ptr<orderParameter> >::iterator j = m_order.begin(); j != m_order.end(); j++ )
|
|
||||||
rpccall += "<value>"+((*j)->toXML(username,cfgfile))+"</value>";
|
|
||||||
rpccall += "</data></array></value>";
|
|
||||||
rpccall += "</member>";
|
|
||||||
}
|
|
||||||
|
|
||||||
if( m_objects.size() ) {
|
|
||||||
rpccall += "<member>";
|
|
||||||
rpccall += "<name>objectid</name>";
|
|
||||||
rpccall += "<value><array><data>";
|
|
||||||
for(vector<string>::iterator j = m_objects.begin(); j != m_objects.end(); j++ )
|
|
||||||
rpccall += "<value>"+(*j)+"</value>";
|
|
||||||
rpccall += "</data></array></value>";
|
|
||||||
rpccall += "</member>";
|
|
||||||
}
|
|
||||||
|
|
||||||
if( m_unset.size() ) {
|
|
||||||
rpccall += "<member>";
|
|
||||||
rpccall += "<name>unset</name>";
|
|
||||||
rpccall += "<value><array><data>";
|
|
||||||
for(vector<string>::iterator j = m_unset.begin(); j != m_unset.end(); j++ )
|
|
||||||
rpccall += "<value><struct><member><name>property</name><value>"+(*j)+"</value></member></struct></value>";
|
|
||||||
rpccall += "</data></array></value>";
|
|
||||||
rpccall += "</member>";
|
|
||||||
}
|
|
||||||
|
|
||||||
rpccall += "</struct>";
|
|
||||||
|
|
||||||
return rpccall;
|
|
||||||
}
|
|
||||||
|
|
||||||
parsedParameters::parsedParameters():
|
|
||||||
m_error(NOERROR),
|
|
||||||
m_user(""),
|
|
||||||
m_ticket(""),
|
|
||||||
m_defaultDisplay(""),
|
|
||||||
m_addConfigFile(""),
|
|
||||||
m_test(false),
|
|
||||||
m_ignoreerrors(false) {}
|
|
||||||
|
|
||||||
string parsedParameters::toXML(string &username, shared_ptr< ::ConfigFileParser > cfgfile) {
|
|
||||||
// begin method call
|
|
||||||
string rpccall = "<?xml version=\"1.0\"?><methodCall><methodName>hsadmin.transaction</methodName><params>";
|
|
||||||
|
|
||||||
// ticket
|
|
||||||
rpccall += "<param><value><string>";
|
|
||||||
if( this->m_ticket != "" ) {
|
|
||||||
string ticket;
|
|
||||||
ifstream file(this->m_ticket.c_str());
|
|
||||||
if( ! file ) {
|
|
||||||
string msg = Logger::getMessageFormatString(Logger::CouldNotOpenFile);
|
|
||||||
boost::format fmt(msg);
|
|
||||||
fmt % this->m_ticket;
|
|
||||||
Logger::log(Logger::FATAL,fmt.str());
|
|
||||||
exit(-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
char ch;
|
|
||||||
while(file.get(ch)) ticket += ch;
|
|
||||||
|
|
||||||
boost::regex findticket(".*\\n---\\n");
|
|
||||||
|
|
||||||
ticket = boost::regex_replace(ticket,findticket,"");
|
|
||||||
if( ticket[ticket.size()-1] == '\0' ) ticket = ticket.substr(0,ticket.size()-2);
|
|
||||||
|
|
||||||
rpccall += ticket;
|
|
||||||
} else {
|
|
||||||
rpccall += cfgfile->getTicket(username);
|
|
||||||
}
|
|
||||||
Logger::log(Logger::DEBUG,"have read ticket");
|
|
||||||
rpccall += "</string></value></param>";
|
|
||||||
|
|
||||||
// global Parameters
|
|
||||||
rpccall += "<param><value><struct>";
|
|
||||||
if( this->m_test )
|
|
||||||
rpccall += "<member><name>test</name><value><boolean>1</boolean></value></member>";
|
|
||||||
rpccall += "</struct></value></param>";
|
|
||||||
|
|
||||||
// calls Array
|
|
||||||
rpccall += "<param><value><array><data>";
|
|
||||||
for( vector<shared_ptr<callParameter> >::iterator c = m_call.begin(); c != m_call.end(); c++ )
|
|
||||||
rpccall += "<value>"+((*c)->toXML(username,cfgfile))+"</value>";
|
|
||||||
|
|
||||||
rpccall += "</data></array></value></param>";
|
|
||||||
|
|
||||||
rpccall += "</params></methodCall>\n";
|
|
||||||
|
|
||||||
return rpccall;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// specific Parser for --runas-Option
|
|
||||||
|
|
||||||
bool VerbosityOption::parseThis(vector<string>& options, shared_ptr<parsedParameters> result) {
|
|
||||||
bool rval = false;
|
|
||||||
if( starts_with(options[0], "-v") ) {
|
|
||||||
if( options[1] == "none" ||
|
|
||||||
options[1] == "normal" ||
|
|
||||||
options[1] == "high" ||
|
|
||||||
options[1] == "debug" ||
|
|
||||||
options[1] == "debugXML" ||
|
|
||||||
options[1] == "debugAll" ) {
|
|
||||||
if( rval = this->handle(options[1], result) ) {
|
|
||||||
if( options[0] == "-v" )
|
|
||||||
options.erase(options.begin(),options.begin()+2);
|
|
||||||
else {
|
|
||||||
erase_first(options[0], "v");
|
|
||||||
options.erase(options.begin()+1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
string p;
|
|
||||||
if( rval = this->handle(p, result) ) {
|
|
||||||
if( options[0] == "-v" )
|
|
||||||
options.erase(options.begin());
|
|
||||||
else
|
|
||||||
erase_first(options[0], "v");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if( starts_with(options[0], "--verbosity=") ) {
|
|
||||||
string p = options[0].substr(12);
|
|
||||||
if( rval = this->handle(p, result) )
|
|
||||||
options.erase(options.begin());
|
|
||||||
}
|
|
||||||
return rval;
|
|
||||||
}
|
|
||||||
|
|
||||||
// constuctors
|
|
||||||
|
|
||||||
TestOption::TestOption() {
|
|
||||||
m_longName = "test";
|
|
||||||
m_shortName = "t";
|
|
||||||
}
|
|
||||||
|
|
||||||
IgnoreErrorOption::IgnoreErrorOption() {
|
|
||||||
m_longName = "ignoreerror";
|
|
||||||
m_shortName = "e";
|
|
||||||
}
|
|
||||||
|
|
||||||
IgnoreErrorsOption::IgnoreErrorsOption() {
|
|
||||||
m_longName = "ignoreerrors";
|
|
||||||
m_shortName = "E";
|
|
||||||
}
|
|
||||||
|
|
||||||
VerbosityOption::VerbosityOption() {
|
|
||||||
m_longName = "verbosity";
|
|
||||||
m_shortName = "v";
|
|
||||||
m_parameterSeparator = "=";
|
|
||||||
}
|
|
||||||
|
|
||||||
RunAsOption::RunAsOption() {
|
|
||||||
m_longName = "runas";
|
|
||||||
m_shortName = "r";
|
|
||||||
m_parameterSeparator = "=";
|
|
||||||
}
|
|
||||||
|
|
||||||
TicketOption::TicketOption() {
|
|
||||||
m_longName = "ticket";
|
|
||||||
m_shortName = "T";
|
|
||||||
m_parameterSeparator = "=";
|
|
||||||
}
|
|
||||||
|
|
||||||
ConfigOption::ConfigOption() {
|
|
||||||
m_longName = "config";
|
|
||||||
m_shortName = "C";
|
|
||||||
m_parameterSeparator = "=";
|
|
||||||
}
|
|
||||||
|
|
||||||
ForceOption::ForceOption() {
|
|
||||||
m_longName = "force";
|
|
||||||
}
|
|
||||||
|
|
||||||
GlobalsOption::GlobalsOption() {
|
|
||||||
m_longName = "globals";
|
|
||||||
m_shortName = "l";
|
|
||||||
}
|
|
||||||
|
|
||||||
WhereOption::WhereOption() {
|
|
||||||
m_longName = "where";
|
|
||||||
m_shortName = "w";
|
|
||||||
m_parameterSeparator = ":";
|
|
||||||
}
|
|
||||||
|
|
||||||
OnlyOption::OnlyOption() {
|
|
||||||
m_longName = "only";
|
|
||||||
m_shortName = "W";
|
|
||||||
m_parameterSeparator = ":";
|
|
||||||
}
|
|
||||||
|
|
||||||
SetOption::SetOption() {
|
|
||||||
m_longName = "set";
|
|
||||||
m_shortName = "s";
|
|
||||||
m_parameterSeparator = ":";
|
|
||||||
}
|
|
||||||
|
|
||||||
SetAllOption::SetAllOption() {
|
|
||||||
m_longName = "setall";
|
|
||||||
m_shortName = "S";
|
|
||||||
m_parameterSeparator = ":";
|
|
||||||
}
|
|
||||||
|
|
||||||
InfileOption::InfileOption() {
|
|
||||||
m_longName = "infile";
|
|
||||||
m_shortName = "f";
|
|
||||||
m_parameterSeparator = ":";
|
|
||||||
}
|
|
||||||
|
|
||||||
OrderOption::OrderOption() {
|
|
||||||
m_longName = "order";
|
|
||||||
m_shortName = "o";
|
|
||||||
m_parameterSeparator = ":";
|
|
||||||
}
|
|
||||||
|
|
||||||
GlobalOrderOption::GlobalOrderOption() {
|
|
||||||
m_longName = "global-order";
|
|
||||||
m_shortName = "O";
|
|
||||||
m_parameterSeparator = ":";
|
|
||||||
}
|
|
||||||
|
|
||||||
InputOption::InputOption() {
|
|
||||||
m_longName = "input";
|
|
||||||
m_shortName = "i";
|
|
||||||
m_parameterSeparator = ":";
|
|
||||||
}
|
|
||||||
|
|
||||||
PassInputOption::PassInputOption() {
|
|
||||||
m_longName = "passinput";
|
|
||||||
m_shortName = "p";
|
|
||||||
m_parameterSeparator = ":";
|
|
||||||
}
|
|
||||||
|
|
||||||
DisplayOption::DisplayOption() {
|
|
||||||
m_longName = "display";
|
|
||||||
m_shortName = "d";
|
|
||||||
m_parameterSeparator = ":";
|
|
||||||
}
|
|
||||||
|
|
||||||
DefaultDisplayOption::DefaultDisplayOption() {
|
|
||||||
m_longName = "default-display";
|
|
||||||
m_shortName = "D";
|
|
||||||
m_parameterSeparator = ":";
|
|
||||||
}
|
|
||||||
|
|
||||||
CallOption::CallOption() {
|
|
||||||
m_longName = "call";
|
|
||||||
m_shortName = "c";
|
|
||||||
m_parameterSeparator = ":";
|
|
||||||
}
|
|
||||||
|
|
||||||
UnsetOption::UnsetOption() {
|
|
||||||
m_longName = "unset";
|
|
||||||
m_shortName = "u";
|
|
||||||
m_parameterSeparator = ":";
|
|
||||||
}
|
|
||||||
|
|
||||||
UnsetAllOption::UnsetAllOption() {
|
|
||||||
m_longName = "unsetall";
|
|
||||||
m_shortName = "U";
|
|
||||||
m_parameterSeparator = ":";
|
|
||||||
}
|
|
||||||
|
|
||||||
ObjectID::ObjectID() { };
|
|
||||||
|
|
||||||
|
|
||||||
// handle functions
|
|
||||||
|
|
||||||
bool TestOption::handle(shared_ptr<parsedParameters> result) {
|
|
||||||
result->m_test = true;
|
|
||||||
Logger::log(Logger::DEBUG," found test Option");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IgnoreErrorOption::handle(shared_ptr<parsedParameters> result) {
|
|
||||||
if( result->m_call.size() <= 0 ) {
|
|
||||||
result->m_error = NeedCall;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
result->m_call.back()->m_ignoreerror = true;
|
|
||||||
Logger::log(Logger::DEBUG," found ignoreerror Option");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IgnoreErrorsOption::handle(shared_ptr<parsedParameters> result) {
|
|
||||||
result->m_ignoreerrors = true;
|
|
||||||
Logger::log(Logger::DEBUG," found ignoreerrors Option");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool VerbosityOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
if( parameter == "none" ) Logger::setLevel(0);
|
|
||||||
else if( parameter == "normal") Logger::setLevel(1);
|
|
||||||
else if( parameter == "high") Logger::setLevel(2);
|
|
||||||
else if( parameter == "debug") Logger::setLevel(3);
|
|
||||||
else if( parameter == "debugXML") Logger::setLevel(4);
|
|
||||||
else if( parameter == "debugAll") Logger::setLevel(5);
|
|
||||||
else Logger::incrementLevel();
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG," set Verbosity Level to "+lexical_cast<string>(Logger::level));
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool QuietOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
Logger::decrementLevel();
|
|
||||||
Logger::log(Logger::DEBUG," set Verbosity Level to "+lexical_cast<string>(Logger::level));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool RunAsOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
result->m_user = parameter;
|
|
||||||
Logger::log(Logger::DEBUG," found runas Option: "+parameter);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool TicketOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
result->m_ticket = parameter;
|
|
||||||
Logger::log(Logger::DEBUG," found ticket Option: "+parameter);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ConfigOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
result->m_addConfigFile = parameter;
|
|
||||||
Logger::log(Logger::DEBUG," found config Option: "+parameter);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ForceOption::handle(shared_ptr<parsedParameters> result) {
|
|
||||||
if( result->m_call.size() <= 0 ) {
|
|
||||||
result->m_error = NeedCall;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
result->m_call.back()->m_force = true;
|
|
||||||
Logger::log(Logger::DEBUG," found force Option");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool GlobalsOption::handle(shared_ptr<parsedParameters> result) {
|
|
||||||
if( result->m_call.size() <= 0 ) {
|
|
||||||
result->m_error = NeedCall;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
result->m_call.back()->m_globalOrderIndex = result->m_call.back()->m_order.size();
|
|
||||||
Logger::log(Logger::DEBUG," found globals Option");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool WhereOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
if( result->m_call.size() <= 0 ) {
|
|
||||||
result->m_error = NeedCall;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
string::size_type pos = parameter.find('=');
|
|
||||||
string property(parameter,0,pos);
|
|
||||||
string pattern(parameter,(pos != string::npos)?(pos+1):(string::npos));
|
|
||||||
|
|
||||||
whereParameter *where = new whereParameter();
|
|
||||||
where->m_property = property;
|
|
||||||
where->m_pattern = pattern;
|
|
||||||
|
|
||||||
result->m_call.back()->m_where.push_back(shared_ptr<whereParameter>(where));
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG," found where Option: "+parameter);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool OnlyOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
string::size_type pos = parameter.find('=');
|
|
||||||
string property(parameter,0,pos);
|
|
||||||
string pattern(parameter,(pos != string::npos)?(pos+1):(string::npos));
|
|
||||||
|
|
||||||
whereParameter *where = new whereParameter();
|
|
||||||
where->m_property = property;
|
|
||||||
where->m_pattern = pattern;
|
|
||||||
|
|
||||||
result->m_only.push_back(shared_ptr<whereParameter>(where));
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG," found only Option: "+parameter);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool UnsetOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
if( result->m_call.size() <= 0 ) {
|
|
||||||
result->m_error = NeedCall;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
result->m_call.back()->m_unset.push_back(parameter);
|
|
||||||
Logger::log(Logger::DEBUG," found unset Option: "+parameter);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool UnsetAllOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
result->m_unsetall.push_back(parameter);
|
|
||||||
Logger::log(Logger::DEBUG," found unsetall Option: "+parameter);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool OrderOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
if( result->m_call.size() <= 0 ) {
|
|
||||||
result->m_error = NeedCall;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
string::size_type pos = parameter.find('=');
|
|
||||||
string *property;
|
|
||||||
string * direction;
|
|
||||||
if( pos != string::npos ) {
|
|
||||||
property = new string(parameter,0,pos);
|
|
||||||
direction = new string(parameter,(pos != string::npos)?(pos+1):(string::npos));
|
|
||||||
} else {
|
|
||||||
property = new string(parameter);
|
|
||||||
direction = new string("a");
|
|
||||||
}
|
|
||||||
|
|
||||||
orderParameter *order = new orderParameter();
|
|
||||||
order->m_property = *property;
|
|
||||||
order->m_ascending = ((*direction)[0] == 'a');
|
|
||||||
|
|
||||||
result->m_call.back()->m_order.push_back(shared_ptr<orderParameter>(order));
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG," found order Option: "+parameter);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool GlobalOrderOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
string::size_type pos = parameter.find('=');
|
|
||||||
string *property;
|
|
||||||
string * direction;
|
|
||||||
if( pos != string::npos ) {
|
|
||||||
property = new string(parameter,0,pos);
|
|
||||||
direction = new string(parameter,(pos != string::npos)?(pos+1):(string::npos));
|
|
||||||
} else {
|
|
||||||
property = new string(parameter);
|
|
||||||
direction = new string("a");
|
|
||||||
}
|
|
||||||
|
|
||||||
orderParameter *order = new orderParameter();
|
|
||||||
order->m_property = *property;
|
|
||||||
order->m_ascending = ((*direction)[0] == 'a');
|
|
||||||
|
|
||||||
result->m_globalOrder.push_back(shared_ptr<orderParameter>(order));
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG," found global order Option: "+parameter);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool SetOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
if( result->m_call.size() <= 0 ) {
|
|
||||||
result->m_error = NeedCall;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
string::size_type pos = parameter.find('=');
|
|
||||||
string property(parameter,0,pos);
|
|
||||||
string value(parameter,(pos != string::npos)?(pos+1):(string::npos));
|
|
||||||
|
|
||||||
setParameter *set = new setParameter();
|
|
||||||
set->m_property = property;
|
|
||||||
set->m_value = value;
|
|
||||||
|
|
||||||
result->m_call.back()->m_set.push_back(shared_ptr<setParameter>(set));
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG," found set Option: "+parameter);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool SetAllOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
string::size_type pos = parameter.find('=');
|
|
||||||
string property(parameter,0,pos);
|
|
||||||
string value(parameter,(pos != string::npos)?(pos+1):(string::npos));
|
|
||||||
|
|
||||||
setParameter *set = new setParameter();
|
|
||||||
set->m_property = property;
|
|
||||||
set->m_value = value;
|
|
||||||
|
|
||||||
result->m_setall.push_back(shared_ptr<setParameter>(set));
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG," found setall Option: "+parameter);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool InfileOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
if( result->m_call.size() <= 0 ) {
|
|
||||||
result->m_error = NeedCall;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
string::size_type pos = parameter.find('=');
|
|
||||||
string property(parameter,0,pos);
|
|
||||||
string filename(parameter,(pos != string::npos)?(pos+1):(string::npos));
|
|
||||||
|
|
||||||
setParameter *set = new setParameter();
|
|
||||||
set->m_property = property;
|
|
||||||
|
|
||||||
ifstream file(filename.c_str());
|
|
||||||
if( ! file ) {
|
|
||||||
string msg = Logger::getMessageFormatString(Logger::CouldNotOpenFile);
|
|
||||||
boost::format fmt(msg);
|
|
||||||
fmt % filename;
|
|
||||||
Logger::log(Logger::FATAL,fmt.str());
|
|
||||||
exit(-1);
|
|
||||||
}
|
|
||||||
char ch;
|
|
||||||
while(file.get(ch)) set->m_value += ch;
|
|
||||||
|
|
||||||
result->m_call.back()->m_set.push_back(shared_ptr<setParameter>(set));
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG," found infile Option: "+parameter);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool InputOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
if( result->m_call.size() <= 0 ) {
|
|
||||||
result->m_error = NeedCall;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
setParameter *set = new setParameter();
|
|
||||||
set->m_property = parameter;
|
|
||||||
cout << "Eingabe (" << parameter << "): " << flush;
|
|
||||||
std::getline(cin, set->m_value);
|
|
||||||
|
|
||||||
result->m_call.back()->m_set.push_back(shared_ptr<setParameter>(set));
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG," found input Option: "+parameter);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
string readPasswd() {
|
|
||||||
string rval = "";
|
|
||||||
struct termios t, t2;
|
|
||||||
|
|
||||||
tcgetattr(0,&t);
|
|
||||||
t2 = t;
|
|
||||||
t2.c_lflag &= ~ECHO;
|
|
||||||
tcsetattr(0,TCSANOW,&t2);
|
|
||||||
std::getline(cin, rval);
|
|
||||||
tcsetattr(0,TCSANOW,&t);
|
|
||||||
|
|
||||||
return rval;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool PassInputOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
if( result->m_call.size() <= 0 ) {
|
|
||||||
result->m_error = NeedCall;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
setParameter *set = new setParameter();
|
|
||||||
set->m_property = parameter;
|
|
||||||
cout << "Passworteingabe (" << parameter << "): " << flush;
|
|
||||||
set->m_value = readPasswd();
|
|
||||||
|
|
||||||
result->m_call.back()->m_set.push_back(shared_ptr<setParameter>(set));
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG," found password-input Option: "+parameter);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool DisplayOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
if( result->m_call.size() <= 0 ) {
|
|
||||||
result->m_error = NeedCall;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
result->m_call.back()->m_display = parameter;
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG," found display Option: "+parameter);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool DefaultDisplayOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
result->m_defaultDisplay = parameter;
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG," found default display Option: "+parameter);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ObjectID::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
if( result->m_call.size() <= 0 ) {
|
|
||||||
result->m_error = NeedCall;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
result->m_call.back()->m_objects.push_back(parameter);
|
|
||||||
Logger::log(Logger::DEBUG," found an ObjectID: "+parameter);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool CallOption::handle(string ¶meter, shared_ptr<parsedParameters> result) {
|
|
||||||
string::size_type pos = parameter.find('.');
|
|
||||||
string module(parameter,0,pos);
|
|
||||||
string function(parameter,(pos != string::npos)?(pos+1):(string::npos));
|
|
||||||
|
|
||||||
callParameter *call = new callParameter();
|
|
||||||
call->m_module = module;
|
|
||||||
call->m_function = function;
|
|
||||||
|
|
||||||
result->m_call.push_back(shared_ptr<callParameter>(call));
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG," found call Option: "+parameter);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
};
|
|
||||||
@ -1,386 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Christof Donat *
|
|
||||||
* cdonat@gmx.de *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
|
|
||||||
#include <vector>
|
|
||||||
#include <string>
|
|
||||||
#include <map>
|
|
||||||
#include <boost/shared_ptr.hpp>
|
|
||||||
#include <boost/scoped_ptr.hpp>
|
|
||||||
|
|
||||||
#include "abstractcmdlineparser.h"
|
|
||||||
#include "configfile.h"
|
|
||||||
|
|
||||||
//! here comes the commandline-Parser - with help of the abstractcommandlineparser.
|
|
||||||
|
|
||||||
namespace commandline {
|
|
||||||
|
|
||||||
#ifndef HSADMIN_CMDLINEPARSER
|
|
||||||
#define HSADMIN_CMDLINEPARSER
|
|
||||||
|
|
||||||
using std::vector;
|
|
||||||
using std::string;
|
|
||||||
using std::map;
|
|
||||||
using boost::shared_ptr;
|
|
||||||
using boost::scoped_ptr;
|
|
||||||
|
|
||||||
// Parameter Objects are the resultof each Parser step and used in second step.
|
|
||||||
|
|
||||||
//! parsed values of a --setall, --set, --input, --passinput or a --infile option
|
|
||||||
class setParameter {
|
|
||||||
public:
|
|
||||||
string m_property;
|
|
||||||
string m_value;
|
|
||||||
|
|
||||||
string toXML(string &username, shared_ptr< ::ConfigFileParser > cfgfile);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! parsed values of a --only or a --where option
|
|
||||||
class whereParameter {
|
|
||||||
public:
|
|
||||||
string m_property;
|
|
||||||
string m_pattern;
|
|
||||||
|
|
||||||
string toXML(string &username, shared_ptr< ::ConfigFileParser > cfgfile);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! parsed values of a --global-order or a --order option
|
|
||||||
class orderParameter {
|
|
||||||
public:
|
|
||||||
string m_property;
|
|
||||||
bool m_ascending;
|
|
||||||
|
|
||||||
string toXML(string &username, shared_ptr< ::ConfigFileParser > cfgfile);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! a whole parsed --call Option which holds all the relevant other options
|
|
||||||
class callParameter {
|
|
||||||
public:
|
|
||||||
callParameter(): m_module(""), m_function(""), m_display(""), m_ignoreerror(false), m_force(false), m_globalOrderIndex(-1) { };
|
|
||||||
|
|
||||||
string m_module;
|
|
||||||
string m_function;
|
|
||||||
|
|
||||||
string m_display;
|
|
||||||
vector<shared_ptr<setParameter> > m_set;
|
|
||||||
vector<shared_ptr<whereParameter> > m_where;
|
|
||||||
vector<shared_ptr<orderParameter> > m_order;
|
|
||||||
vector<string> m_objects;
|
|
||||||
vector<string> m_unset;
|
|
||||||
|
|
||||||
bool m_ignoreerror;
|
|
||||||
bool m_force;
|
|
||||||
int m_globalOrderIndex;
|
|
||||||
|
|
||||||
vector<string> parseDisplayspec();
|
|
||||||
string evalDisplay(const map<string, string> &values);
|
|
||||||
string toXML(string &username, shared_ptr< ::ConfigFileParser > cfgfile);
|
|
||||||
};
|
|
||||||
|
|
||||||
enum parseError { NOERROR = 0, NeedCall = 1 };
|
|
||||||
|
|
||||||
//! all the parsed values
|
|
||||||
class parsedParameters {
|
|
||||||
public:
|
|
||||||
parsedParameters();
|
|
||||||
parseError m_error;
|
|
||||||
string m_user;
|
|
||||||
string m_ticket;
|
|
||||||
string m_defaultDisplay;
|
|
||||||
string m_addConfigFile;
|
|
||||||
bool m_test;
|
|
||||||
bool m_ignoreerrors;
|
|
||||||
vector<shared_ptr<whereParameter> > m_only;
|
|
||||||
vector<shared_ptr<setParameter> > m_setall;
|
|
||||||
vector<shared_ptr<orderParameter> > m_globalOrder;
|
|
||||||
vector<shared_ptr<callParameter> > m_call;
|
|
||||||
vector<string> m_unsetall;
|
|
||||||
|
|
||||||
string toXML(string &username, shared_ptr< ::ConfigFileParser > cfgfile);
|
|
||||||
};
|
|
||||||
|
|
||||||
// Option classes are used in first Parse step
|
|
||||||
|
|
||||||
//! --test
|
|
||||||
class TestOption: public abstractcommandlineparser::CmdLineOption<true,true,false,parsedParameters> {
|
|
||||||
public:
|
|
||||||
TestOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --ignoreerror
|
|
||||||
class IgnoreErrorOption: public abstractcommandlineparser::CmdLineOption<true,true,false,parsedParameters> {
|
|
||||||
public:
|
|
||||||
IgnoreErrorOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --ignoreerrors
|
|
||||||
class IgnoreErrorsOption: public IgnoreErrorOption {
|
|
||||||
public:
|
|
||||||
IgnoreErrorsOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --verbosity
|
|
||||||
class VerbosityOption: public abstractcommandlineparser::CmdLineOption<true,true,true,parsedParameters> {
|
|
||||||
public:
|
|
||||||
VerbosityOption();
|
|
||||||
bool parseThis(vector<string>& options, shared_ptr<parsedParameters> result);
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --quiet
|
|
||||||
class QuietOption: public abstractcommandlineparser::CmdLineOption<true,true,false,parsedParameters> {
|
|
||||||
public:
|
|
||||||
QuietOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --runas
|
|
||||||
class RunAsOption: public abstractcommandlineparser::CmdLineOption<true,true,true,parsedParameters> {
|
|
||||||
public:
|
|
||||||
RunAsOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --ticket
|
|
||||||
class TicketOption: public abstractcommandlineparser::CmdLineOption<true,true,true,parsedParameters> {
|
|
||||||
public:
|
|
||||||
TicketOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --config
|
|
||||||
class ConfigOption: public abstractcommandlineparser::CmdLineOption<true,true,true,parsedParameters> {
|
|
||||||
public:
|
|
||||||
ConfigOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string & parameter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --force
|
|
||||||
class ForceOption: public abstractcommandlineparser::CmdLineOption<true,false,false,parsedParameters> {
|
|
||||||
public:
|
|
||||||
ForceOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --globals
|
|
||||||
class GlobalsOption: public abstractcommandlineparser::CmdLineOption<true,true,false,parsedParameters> {
|
|
||||||
public:
|
|
||||||
GlobalsOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --where
|
|
||||||
class WhereOption: public abstractcommandlineparser::CmdLineOption<true,true,true,parsedParameters> {
|
|
||||||
public:
|
|
||||||
WhereOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --only
|
|
||||||
class OnlyOption: public WhereOption {
|
|
||||||
public:
|
|
||||||
OnlyOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --set
|
|
||||||
class SetOption: public abstractcommandlineparser::CmdLineOption<true,true,true,parsedParameters> {
|
|
||||||
public:
|
|
||||||
SetOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --setall
|
|
||||||
class SetAllOption: public SetOption {
|
|
||||||
public:
|
|
||||||
SetAllOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --infile
|
|
||||||
class InfileOption: public abstractcommandlineparser::CmdLineOption<true,true,true,parsedParameters> {
|
|
||||||
public:
|
|
||||||
InfileOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --order
|
|
||||||
class OrderOption: public abstractcommandlineparser::CmdLineOption<true,true,true,parsedParameters> {
|
|
||||||
public:
|
|
||||||
OrderOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --global-order
|
|
||||||
class GlobalOrderOption: public OrderOption {
|
|
||||||
public:
|
|
||||||
GlobalOrderOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --input
|
|
||||||
class InputOption: public abstractcommandlineparser::CmdLineOption<true,true,true,parsedParameters> {
|
|
||||||
public:
|
|
||||||
InputOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --passinput
|
|
||||||
class PassInputOption: public abstractcommandlineparser::CmdLineOption<true,true,true,parsedParameters> {
|
|
||||||
public:
|
|
||||||
PassInputOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --display
|
|
||||||
class DisplayOption: public abstractcommandlineparser::CmdLineOption<true,true,true,parsedParameters> {
|
|
||||||
public:
|
|
||||||
DisplayOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --default-display
|
|
||||||
class DefaultDisplayOption: public DisplayOption {
|
|
||||||
public:
|
|
||||||
DefaultDisplayOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --call
|
|
||||||
class CallOption: public abstractcommandlineparser::CmdLineOption<true,true,true,parsedParameters> {
|
|
||||||
public:
|
|
||||||
CallOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --unset
|
|
||||||
class UnsetOption: public abstractcommandlineparser::CmdLineOption<true,true,true,parsedParameters> {
|
|
||||||
public:
|
|
||||||
UnsetOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! --unsetall
|
|
||||||
class UnsetAllOption: public abstractcommandlineparser::CmdLineOption<true,true,true,parsedParameters> {
|
|
||||||
public:
|
|
||||||
UnsetAllOption();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! all other parameters are objectIDs.
|
|
||||||
class ObjectID: public abstractcommandlineparser::CmdLineOption<false,false,true,parsedParameters> {
|
|
||||||
public:
|
|
||||||
ObjectID();
|
|
||||||
protected:
|
|
||||||
virtual bool handle(string ¶meter, shared_ptr<parsedParameters> result);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! putting it all together in a typelist
|
|
||||||
typedef Parameterlist24(
|
|
||||||
TestOption,
|
|
||||||
IgnoreErrorsOption,
|
|
||||||
VerbosityOption,
|
|
||||||
RunAsOption,
|
|
||||||
TicketOption,
|
|
||||||
ConfigOption,
|
|
||||||
SetAllOption,
|
|
||||||
UnsetAllOption,
|
|
||||||
OnlyOption,
|
|
||||||
GlobalOrderOption,
|
|
||||||
DefaultDisplayOption,
|
|
||||||
IgnoreErrorOption,
|
|
||||||
ForceOption,
|
|
||||||
GlobalsOption,
|
|
||||||
WhereOption,
|
|
||||||
SetOption,
|
|
||||||
InfileOption,
|
|
||||||
OrderOption,
|
|
||||||
InputOption,
|
|
||||||
PassInputOption,
|
|
||||||
UnsetOption,
|
|
||||||
DisplayOption,
|
|
||||||
ObjectID,
|
|
||||||
CallOption ) allParameters;
|
|
||||||
|
|
||||||
//! generating a class with parse()-function from the list of Options
|
|
||||||
typedef abstractcommandlineparser::CmdLineOptionList<allParameters, parsedParameters> Parameters;
|
|
||||||
|
|
||||||
#else
|
|
||||||
class parsedParameters;
|
|
||||||
class setParameter;
|
|
||||||
class whereParameter;
|
|
||||||
class orderParameter;
|
|
||||||
class callParameter;
|
|
||||||
class TestOption;
|
|
||||||
class IgnoreErrorOption;
|
|
||||||
class IgnoreErrorsOption;
|
|
||||||
class VerbosityOption;
|
|
||||||
class RunAsOption;
|
|
||||||
class TicketOption;
|
|
||||||
class ConfigOption;
|
|
||||||
class SetAllOption;
|
|
||||||
class OnlyOption;
|
|
||||||
class UnsetAllOption;
|
|
||||||
class GlobalOrderOption;
|
|
||||||
class DefaultDisplayOption;
|
|
||||||
class ForceOption;
|
|
||||||
class GlobalsOption;
|
|
||||||
class WhereOption;
|
|
||||||
class SetOption;
|
|
||||||
class InfileOption;
|
|
||||||
class OrderOption;
|
|
||||||
class InputOption;
|
|
||||||
class PassInputOption;
|
|
||||||
class DisplayOption;
|
|
||||||
class unsetOption;
|
|
||||||
class CallOption;
|
|
||||||
class ObjectID;
|
|
||||||
|
|
||||||
#endif /* HSADMIN_CMDLINEPARSER */
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
@ -1,257 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Christof Donat *
|
|
||||||
* cdonat@gmx.de *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#include "configfile.h"
|
|
||||||
#include "logger.h"
|
|
||||||
|
|
||||||
#include <boost/filesystem/exception.hpp>
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/filesystem/fstream.hpp>
|
|
||||||
#include <boost/algorithm/string.hpp>
|
|
||||||
#include <boost/regex.hpp>
|
|
||||||
#include <boost/lexical_cast.hpp>
|
|
||||||
#include <boost/format.hpp>
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
#include <iostream>
|
|
||||||
#include <sstream>
|
|
||||||
#include <fstream>
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/wait.h>
|
|
||||||
#include <signal.h>
|
|
||||||
#include <errno.h>
|
|
||||||
|
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
|
|
||||||
using std::ostringstream;
|
|
||||||
using std::istringstream;
|
|
||||||
using std::ifstream;
|
|
||||||
using std::fstream;
|
|
||||||
using std::string;
|
|
||||||
using boost::lexical_cast;
|
|
||||||
using boost::bad_lexical_cast;
|
|
||||||
|
|
||||||
ConfigFileFinder::ConfigFileFinder(Transaction& t): vector<string*>() {
|
|
||||||
try {
|
|
||||||
boost::filesystem::path general("/etc/hsadminc.conf");
|
|
||||||
if( boost::filesystem::exists(general) && !boost::filesystem::is_directory(general) )
|
|
||||||
this->loadFile(general.native());
|
|
||||||
} catch(boost::filesystem::filesystem_error) {}
|
|
||||||
|
|
||||||
string priv = getenv("HOME");
|
|
||||||
try {
|
|
||||||
boost::filesystem::path p( priv + "/.hsadmin.conf");
|
|
||||||
|
|
||||||
if( boost::filesystem::exists(p) && !boost::filesystem::is_directory(p) )
|
|
||||||
this->loadFile(p.native());
|
|
||||||
} catch(boost::filesystem::filesystem_error) {}
|
|
||||||
|
|
||||||
shared_ptr<commandline::parsedParameters> params = t.getParsed();
|
|
||||||
if( params->m_addConfigFile != "" ) try {
|
|
||||||
boost::filesystem::path c( params->m_addConfigFile);
|
|
||||||
|
|
||||||
if( boost::filesystem::exists(c) && !boost::filesystem::is_directory(c) )
|
|
||||||
this->loadFile(c.native());
|
|
||||||
} catch(boost::filesystem::filesystem_error) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
void ConfigFileFinder::loadFile(string filename) {
|
|
||||||
ifstream file(filename.c_str(),std::ios::in);
|
|
||||||
ostringstream reader;
|
|
||||||
reader << file.rdbuf();
|
|
||||||
string *tmp = new string(reader.str());
|
|
||||||
this->insert(this->end(),tmp);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ConfigFileParser::parse(string& text) {
|
|
||||||
vector<string> lines;
|
|
||||||
config * current = &(this->basic);
|
|
||||||
vector<config> configs;
|
|
||||||
|
|
||||||
boost::split(lines,text,boost::is_any_of("\n"));
|
|
||||||
|
|
||||||
if( current->pattern != ".*" ) {
|
|
||||||
current->pattern = ".*";
|
|
||||||
current->ticketcommand = "hsadmint \\0";
|
|
||||||
current->server = "http://localhost:7777/RPC2";
|
|
||||||
current->shell = "/bin/sh";
|
|
||||||
current->askpass = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
for( vector<string>::iterator i = lines.begin(); i != lines.end(); i++ ) {
|
|
||||||
string& line = *i;
|
|
||||||
// ignore coments and empty lines
|
|
||||||
boost::trim_left(line);
|
|
||||||
if( line[0] == '#' || line == "" )
|
|
||||||
continue;
|
|
||||||
|
|
||||||
// is this a section?
|
|
||||||
if( line[0] == '[' ) {
|
|
||||||
line.erase(0,1);
|
|
||||||
line.erase(line.rfind(']'));
|
|
||||||
|
|
||||||
if( current != &(this->basic) ) {
|
|
||||||
configs.insert(configs.end(),*current);
|
|
||||||
delete(current);
|
|
||||||
}
|
|
||||||
current = new config;
|
|
||||||
*current = this->basic;
|
|
||||||
|
|
||||||
current->pattern = line;
|
|
||||||
} else {
|
|
||||||
string::size_type equals = line.find('=');
|
|
||||||
string name = boost::trim_copy(line.substr(0,equals));
|
|
||||||
string value = boost::trim_copy(line.substr(equals+1));
|
|
||||||
|
|
||||||
// trim name and value
|
|
||||||
boost::trim(name);
|
|
||||||
boost::trim(value);
|
|
||||||
|
|
||||||
if( name == "ticket" )
|
|
||||||
current->ticketcommand = value;
|
|
||||||
else if( name == "server" )
|
|
||||||
current->server = value;
|
|
||||||
else if( name == "shell" )
|
|
||||||
current->shell = value;
|
|
||||||
else if( name == "askpass" && value == "true" )
|
|
||||||
current->askpass = true;
|
|
||||||
else if( name == "askpass" && value == "false" )
|
|
||||||
current->askpass = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if( current != &(this->basic) ) {
|
|
||||||
configs.insert(configs.end(),*current);
|
|
||||||
delete(current);
|
|
||||||
}
|
|
||||||
|
|
||||||
this->configs.insert(this->configs.begin(),configs.begin(),configs.end());
|
|
||||||
}
|
|
||||||
|
|
||||||
string ConfigFileParser::replaceStringMatches(string &userpattern, string username, string content) {
|
|
||||||
if( username == "" ) {
|
|
||||||
char* u = (char*)malloc(L_cuserid+1);;
|
|
||||||
cuserid(u);
|
|
||||||
if( u != 0 ) username = u;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
boost::regex pattern(userpattern);
|
|
||||||
boost::cmatch results;
|
|
||||||
if( !boost::regex_match(username.c_str(),results,pattern) ) return content;
|
|
||||||
|
|
||||||
for(int j = 0; j < results.size(); j++) {
|
|
||||||
ostringstream p;
|
|
||||||
p << "^\\\\" << j << "|([^\\\\])\\\\" << j;
|
|
||||||
boost::regex pat(p.str());
|
|
||||||
|
|
||||||
string replace = "$1";
|
|
||||||
if( results[j].matched ) for( const char* i = results[j].first; i != results[j].second; i++ )
|
|
||||||
replace += *i;
|
|
||||||
|
|
||||||
content = boost::regex_replace(content,pat,replace);
|
|
||||||
}
|
|
||||||
|
|
||||||
return content;
|
|
||||||
}
|
|
||||||
|
|
||||||
string ConfigFileParser::getTicket(string &username) {
|
|
||||||
string ticketstring = "";
|
|
||||||
config cfg = this->getConfig(username);
|
|
||||||
string command = cfg.getTicketcommand(username);
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG,"use '"+command+"' as command");
|
|
||||||
|
|
||||||
pid_t pid;
|
|
||||||
pid_t parentpid = getpid();
|
|
||||||
int cmdout[2];
|
|
||||||
|
|
||||||
if(pipe(cmdout) || (pid=fork()) == -1)
|
|
||||||
return "";
|
|
||||||
|
|
||||||
if(!pid) {
|
|
||||||
close(1);
|
|
||||||
close(cmdout[0]);
|
|
||||||
dup(cmdout[1]);
|
|
||||||
//command = cfg.shell+" -c \""+command+"\"";
|
|
||||||
|
|
||||||
// this should never return.
|
|
||||||
execlp(cfg.shell.c_str(),cfg.shell.c_str(),"-c",command.c_str(),(char*)0);
|
|
||||||
|
|
||||||
// if we have reached this something has gone wrong.
|
|
||||||
string msg = Logger::getMessageFormatString(Logger::ErrorWithTicketCommand);
|
|
||||||
boost::format fmt(msg);
|
|
||||||
fmt % cfg.shell % command % Logger::getErrnoMessage(errno);
|
|
||||||
Logger::log(Logger::FATAL,fmt.str());
|
|
||||||
exit(-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
int status;
|
|
||||||
waitpid(pid,&status,0);
|
|
||||||
close(cmdout[1]);
|
|
||||||
|
|
||||||
// check if ticket has been successfully generated
|
|
||||||
if( !WIFEXITED(status) || WEXITSTATUS(status) )
|
|
||||||
exit(WEXITSTATUS(status));
|
|
||||||
|
|
||||||
char buf[257];
|
|
||||||
bzero(buf,257);
|
|
||||||
errno = 0;
|
|
||||||
int i = 0;
|
|
||||||
|
|
||||||
while( (i = read(cmdout[0],buf,256)) != 0 ) {
|
|
||||||
if( i < 0 ) {
|
|
||||||
if( errno == EAGAIN ) {
|
|
||||||
usleep(20);
|
|
||||||
continue;
|
|
||||||
} else if( errno == EINTR ) continue;
|
|
||||||
else {
|
|
||||||
string msg = Logger::getMessageFormatString(Logger::ErrorReadingTicket);
|
|
||||||
boost::format fmt(msg);
|
|
||||||
fmt % Logger::getErrnoMessage(errno);
|
|
||||||
Logger::log(Logger::FATAL,fmt.str());
|
|
||||||
exit(-1);
|
|
||||||
}
|
|
||||||
errno = 0;
|
|
||||||
}
|
|
||||||
ticketstring += buf;
|
|
||||||
if( strlen(buf) < i ) break;
|
|
||||||
bzero(buf,257);
|
|
||||||
}
|
|
||||||
|
|
||||||
return ticketstring;
|
|
||||||
}
|
|
||||||
|
|
||||||
ConfigFileParser::config &ConfigFileParser::getConfig(string &username) {
|
|
||||||
if( username == "" ) return basic;
|
|
||||||
|
|
||||||
for( vector<config>::iterator i = configs.begin(); i != configs.end(); i++ ) {
|
|
||||||
boost::regex pat(i->pattern);
|
|
||||||
if(boost::regex_match(username,pat)) return *i;
|
|
||||||
}
|
|
||||||
|
|
||||||
return basic;
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,94 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Christof Donat *
|
|
||||||
* cdonat@gmx.de *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#include <vector>
|
|
||||||
#include <string>
|
|
||||||
#include <iostream>
|
|
||||||
|
|
||||||
#ifndef HSADMIN_CONFIGFILE
|
|
||||||
#define HSADMIN_CONFIGFILE
|
|
||||||
|
|
||||||
#include "transaction.h"
|
|
||||||
|
|
||||||
using std::vector;
|
|
||||||
using std::string;
|
|
||||||
using std::iostream;
|
|
||||||
|
|
||||||
//! this class manages configfiles
|
|
||||||
class ConfigFileFinder: public vector<string*> {
|
|
||||||
public:
|
|
||||||
//! find the standard config-files
|
|
||||||
ConfigFileFinder(Transaction& t);
|
|
||||||
//! load a config file
|
|
||||||
void loadFile(string filename);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! parser for config files
|
|
||||||
class ConfigFileParser {
|
|
||||||
public:
|
|
||||||
//! parses one text
|
|
||||||
inline ConfigFileParser(string& text) { this->parse(text); };
|
|
||||||
//! parses multiple texts
|
|
||||||
inline ConfigFileParser(vector<string*>* texts) { this->parse(texts); };
|
|
||||||
|
|
||||||
inline string getTicket() { string s = ""; return getTicket(s); };
|
|
||||||
|
|
||||||
/** \brief get a ticket for a specified user.
|
|
||||||
*
|
|
||||||
* this function finds the config for this user and calls the tocket-command
|
|
||||||
* with the specified shell.
|
|
||||||
*/
|
|
||||||
string getTicket(string &username);
|
|
||||||
|
|
||||||
//! replaces references (\0, \1, etc.) in content with regex-matches.
|
|
||||||
static string replaceStringMatches(string &userpattern, string username, string content);
|
|
||||||
|
|
||||||
//! holds single config entries
|
|
||||||
struct config {
|
|
||||||
string pattern;
|
|
||||||
string ticketcommand;
|
|
||||||
string server;
|
|
||||||
string shell;
|
|
||||||
bool askpass;
|
|
||||||
|
|
||||||
string getTicketcommand(string &username) { return ConfigFileParser::replaceStringMatches(pattern,username,ticketcommand); };
|
|
||||||
string getServer(string &username) { return ConfigFileParser::replaceStringMatches(pattern,username,ticketcommand); };
|
|
||||||
string getShell(string &username) { return ConfigFileParser::replaceStringMatches(pattern,username,ticketcommand); };
|
|
||||||
};
|
|
||||||
|
|
||||||
//! find the config for a specified user
|
|
||||||
config& getConfig(string &username);
|
|
||||||
|
|
||||||
private:
|
|
||||||
void parse(string& text);
|
|
||||||
inline void parse(vector<string*>* texts) {
|
|
||||||
for( vector<string*>::iterator i = texts->begin(); i != texts->end(); i++ )
|
|
||||||
this->parse(**i);
|
|
||||||
}
|
|
||||||
|
|
||||||
vector<config> configs;
|
|
||||||
config basic;
|
|
||||||
};
|
|
||||||
|
|
||||||
#else
|
|
||||||
class ConfigFileFinder;
|
|
||||||
class ConfigFileParser;
|
|
||||||
|
|
||||||
#endif /* HSADMIN_CONFIGFILE */
|
|
||||||
@ -1,155 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Christof Donat *
|
|
||||||
* cdonat@gmx.de *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
#include <config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <iostream>
|
|
||||||
#include <cstdlib>
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
#include <boost/shared_ptr.hpp>
|
|
||||||
#include <boost/scoped_ptr.hpp>
|
|
||||||
#include <boost/algorithm/string.hpp>
|
|
||||||
|
|
||||||
#include "cmdlineparser.h"
|
|
||||||
#include "configfile.h"
|
|
||||||
#include "logger.h"
|
|
||||||
#include "transaction.h"
|
|
||||||
|
|
||||||
using std::string;
|
|
||||||
using std::vector;
|
|
||||||
using std::cerr;
|
|
||||||
using std::endl;
|
|
||||||
using boost::shared_ptr;
|
|
||||||
using boost::scoped_ptr;
|
|
||||||
using boost::starts_with;
|
|
||||||
|
|
||||||
void printErrorMessage(Transaction& transact, vector<string>& options) {
|
|
||||||
shared_ptr<commandline::parsedParameters> p = transact.getParsed();
|
|
||||||
string FailedOption = options[0];
|
|
||||||
if( starts_with(FailedOption,"--") )
|
|
||||||
FailedOption = FailedOption.substr(2);
|
|
||||||
else if( starts_with(FailedOption,"-") )
|
|
||||||
FailedOption = FailedOption.substr(1,2);
|
|
||||||
|
|
||||||
cerr << "Error on Commandline at Parameter '"<< FailedOption;
|
|
||||||
if( p->m_error == commandline::NeedCall )
|
|
||||||
cerr << ": call specific Parameter before call";
|
|
||||||
cerr << endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
void printUsage(char* cmdname) {
|
|
||||||
cerr << "Usage: " << endl << endl;
|
|
||||||
cerr << cmdname << " [--test|-t]" << endl;
|
|
||||||
cerr << "[--ignoreerrors|-e]" << endl;
|
|
||||||
cerr << "[--verbosity=<level>|-v <level>]" << endl;
|
|
||||||
cerr << "[--quiet|-q]" << endl;
|
|
||||||
cerr << "[--runas=<user>|-r <user>]" << endl;
|
|
||||||
cerr << "[--ticket=<ticketfile>|-T <ticketfile>]" << endl;
|
|
||||||
cerr << "[--config=<configfile>|-C <configfile>]" << endl;
|
|
||||||
cerr << "[--default-display:<displaySpec>|-D <displaySpec>]" << endl;
|
|
||||||
cerr << "[(--only:<property_1>=<expr_1>|-W <property_1>=<expr_1>)" << endl;
|
|
||||||
cerr << " ... (--only:<property_n>=<expr_n>|-W <property_n>=<expr_n>)]" << endl;
|
|
||||||
cerr << "[(--setall:<property_1>=<value_1>|-S <property_1>=<value_1>)" << endl;
|
|
||||||
cerr << " ... (--setall:<property_n>=<value_n>|-S <property_n>=<value_n>)]" << endl;
|
|
||||||
cerr << " [(--unsetall:property_1|-U property_1) ... (--unsetall:property_n|-U property_n)]" << endl;
|
|
||||||
cerr << "[(--global-order:<property_1>[=(asc|desc|a|d)]|-O <property_1>[=(asc|desc|a|d)])" << endl;
|
|
||||||
cerr << " ..." << endl;
|
|
||||||
cerr << " (--global-order:<property_n>[=(asc|desc|a|d)]|-O <property_n>[=(asc|desc|a|d)]]" << endl;
|
|
||||||
cerr << " [--ignoreerrors|-E]" << endl;
|
|
||||||
cerr << "(--call:<module_1>.<function_1>|-c <module_1>.<function_1>)" << endl;
|
|
||||||
cerr << " [--force]" << endl;
|
|
||||||
cerr << " [--ignoreerror|-e]" << endl;
|
|
||||||
cerr << " [--display:<displaySpec>|-d <displaySpec>]" << endl;
|
|
||||||
cerr << " [(--where:<property_1_1>=<expr_1_1>|-w <property_1_1>=<expr_1_1>)" << endl;
|
|
||||||
cerr << " ... (--where:<property_1_n>=<expr_1_n>|-w <property_1_n>=<expr_1_n>)]" << endl;
|
|
||||||
cerr << " [(--set:<property_1_1>=<value_1_1>|-s <property_1_1>=<value_1_1>)" << endl;
|
|
||||||
cerr << " ... (--set:<property_1_n>=<value_1_n>|-s <property_1_n>=<value_1_n>)]" << endl;
|
|
||||||
cerr << " [(--input:<property_1_1>|-i <property_1_1>)" << endl;
|
|
||||||
cerr << " ... (--input:<property_1_n>|-i <property_1_n>)]" << endl;
|
|
||||||
cerr << " [(--passinput:<property_1_1>|-p <property_1_1>)" << endl;
|
|
||||||
cerr << " ... (--passinput:<property_1_n>|-p <property_1_n>)]" << endl;
|
|
||||||
cerr << " [(--infile:<property_1_1>=<file_1_1>|-f <property_1_1>=<file_1_1>)" << endl;
|
|
||||||
cerr << " ... (--infile:<property_1_n>=<file_1_n>|-f <property_1_n>=<file_1_n>)]" << endl;
|
|
||||||
cerr << " [(--unset:property_1_1|-u property_1_1]) ... (--unset:property_1_n|-u property_1_n])]" << endl;
|
|
||||||
cerr << " [(--order:<property_1_1>[=(asc|desc|a|d)]|-o <property_1_1>[=(asc|desc|a|d)])" << endl;
|
|
||||||
cerr << " ..." << endl;
|
|
||||||
cerr << " [--globals|-l]" << endl;
|
|
||||||
cerr << " ..." << endl;
|
|
||||||
cerr << " (--order:<property_1_n>[=(asc|desc|a|d)]|-o <property_1_n>[=(asc|desc|a|d)]]" << endl;
|
|
||||||
cerr << " [object_1_1 ... object_1_n]" << endl;
|
|
||||||
cerr << "..." << endl;
|
|
||||||
cerr << "(--call:<module_m>.<function_m>|-c <module_m>.<function_m>)" << endl;
|
|
||||||
cerr << " [--force]" << endl;
|
|
||||||
cerr << " [--ignoreerror|-e]" << endl;
|
|
||||||
cerr << " [--display:<displaySpec>|-d <displaySpec>]" << endl;
|
|
||||||
cerr << " [(--where:<property_m_1>=<expr_m_1>|-w <property_m_1>=<expr_m_1>)" << endl;
|
|
||||||
cerr << " ... (--where:<property_m_n>=<expr_m_n>|-w <property_m_n>=<expr_m_n>)]" << endl;
|
|
||||||
cerr << " [(--set:<property_m_1>=<value_m_1>|-s <property_m_1>=<value_m_1>)" << endl;
|
|
||||||
cerr << " ... (--set:<property_m_n>=<value_m_n>|-s <property_m_n>=<value_m_n>)]" << endl;
|
|
||||||
cerr << " [(--input:<property_m_1>|-i <property_m_1>)" << endl;
|
|
||||||
cerr << " ... (--input:<property_m_n>|-i <property_m_n>)]" << endl;
|
|
||||||
cerr << " [(--passinput:<property_m_1>|-p <property_m_1>)" << endl;
|
|
||||||
cerr << " ... (--passinput:<property_m_n>|-p <property_m_n>)]" << endl;
|
|
||||||
cerr << " [(--infile:<property_m_1>=<file_m_1>|-f <property_m_1>=<file_m_1>)" << endl;
|
|
||||||
cerr << " ... (--infile:<property_m_n>=<file_m_n>|-f <property_m_n>=<file_m_n>)]" << endl;
|
|
||||||
cerr << " [(--unset:property_m_1|-u property_m_1]) ... (--unset:property_m_n|-u property_m_n])]" << endl;
|
|
||||||
cerr << " [(--order:<property_m_1>[=(asc|desc|a|d)]|-o <property_m_1>[=(asc|desc|a|d)])" << endl;
|
|
||||||
cerr << " ..." << endl;
|
|
||||||
cerr << " [--globals|-l]" << endl;
|
|
||||||
cerr << " ..." << endl;
|
|
||||||
cerr << " (--order:<property_m_n>[=(asc|desc|a|d)]|-o <property_m_n>[=(asc|desc|a|d)]]" << endl;
|
|
||||||
cerr << " [object_m_1 ... object_m_n]" << endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
|
||||||
{
|
|
||||||
if( argc == 1 ) {
|
|
||||||
printUsage(*argv);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
vector<string> options(argv+1,argv+argc);
|
|
||||||
Transaction transact(options);
|
|
||||||
|
|
||||||
if( !transact ) {
|
|
||||||
printErrorMessage(transact, options);
|
|
||||||
printUsage(*argv);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG,"have parsed Parameters");
|
|
||||||
|
|
||||||
scoped_ptr<ConfigFileFinder> cfff(new ConfigFileFinder(transact));
|
|
||||||
shared_ptr<ConfigFileParser> cfg(new ConfigFileParser(cfff.get()));
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG,"have read config File");
|
|
||||||
|
|
||||||
transact(cfg);
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG,"have executed Transaction");
|
|
||||||
|
|
||||||
//cout << transact.formatOutput();
|
|
||||||
//exit(transact.errorCode());
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
@ -1,146 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Christof Donat *
|
|
||||||
* cdonat@gmx.de *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#include "httpclient.h"
|
|
||||||
#include "logger.h"
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <netinet/in.h>
|
|
||||||
#include <arpa/inet.h>
|
|
||||||
#include <netdb.h>
|
|
||||||
|
|
||||||
using std::string;
|
|
||||||
using std::streamsize;
|
|
||||||
using std::iostream;
|
|
||||||
using boost::lexical_cast;
|
|
||||||
using boost::bad_lexical_cast;
|
|
||||||
|
|
||||||
TCPDevice::TCPDevice(const string& address, const short int port) {
|
|
||||||
this->init(address.c_str(),port);
|
|
||||||
}
|
|
||||||
TCPDevice::TCPDevice(const char* address, const short int port) {
|
|
||||||
this->init(address,port);
|
|
||||||
}
|
|
||||||
|
|
||||||
void TCPDevice::init(const char* address, const short int port) {
|
|
||||||
struct sockaddr_in addr;
|
|
||||||
bzero(&addr,sizeof(addr));
|
|
||||||
addr.sin_family = AF_INET;
|
|
||||||
if( (addr.sin_addr.s_addr = inet_addr(address)) == INADDR_NONE ) {
|
|
||||||
struct hostent* hp = gethostbyname(address);
|
|
||||||
if( hp == 0 ) throw("can't resolve hostname '"+string(address)+"'");
|
|
||||||
bcopy(hp->h_addr, (char*) &addr.sin_addr, hp->h_length);
|
|
||||||
}
|
|
||||||
addr.sin_port = htons(port);
|
|
||||||
|
|
||||||
if( (m_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0 ) throw(string("can't open socket"));
|
|
||||||
if( ::connect(m_socket, (struct sockaddr*) &addr, sizeof(addr)) < 0 ) {
|
|
||||||
::close(m_socket);
|
|
||||||
throw("can't connect to '"+string(address)+"' port "+(lexical_cast<string>(port)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
TCPDevice::TCPDevice(const int socket) : m_socket(socket) {}
|
|
||||||
TCPDevice::TCPDevice(const TCPDevice& other) : m_socket(other.m_socket) { }
|
|
||||||
|
|
||||||
TCPDevice::~TCPDevice() { }
|
|
||||||
|
|
||||||
void TCPDevice::closeSocket() { ::close(m_socket); }
|
|
||||||
|
|
||||||
streamsize TCPDevice::read(char* s, streamsize n) { return (streamsize)::read(m_socket,(void*)s,(size_t)n); }
|
|
||||||
|
|
||||||
streamsize TCPDevice::write(const char* s, streamsize n) { return (streamsize)::write(m_socket,(const void*)s,(size_t)n); }
|
|
||||||
|
|
||||||
GenericHttpClient::GenericHttpClient(const string &url, const unsigned short defaultPort = 80):
|
|
||||||
m_url(url), m_defaultPort(defaultPort) {};
|
|
||||||
|
|
||||||
string GenericHttpClient::post(string postcontent) {
|
|
||||||
iostream *connection;
|
|
||||||
try { connection = this->parseUrl(); }
|
|
||||||
catch(string &e) {
|
|
||||||
Logger::log(Logger::FATAL,"connection failed: "+e);
|
|
||||||
exit(-1);
|
|
||||||
}
|
|
||||||
if( connection == 0 ) return "";
|
|
||||||
|
|
||||||
string outbuf = "POST "+m_path+" HTTP/1.1\r\n";
|
|
||||||
outbuf += "Connection: close\r\n";
|
|
||||||
outbuf += "User-Agent: hsadmin CLI client\r\n";
|
|
||||||
outbuf += "Content-Type: text/xml\r\n";
|
|
||||||
outbuf += "Content-Length: "+boost::lexical_cast<string>(postcontent.length())+"\r\n";
|
|
||||||
outbuf += "Host: "+m_hostname+"\r\n\r\n";
|
|
||||||
outbuf += postcontent;
|
|
||||||
|
|
||||||
for( int i = 0; i < outbuf.length(); i++ )
|
|
||||||
(*connection) << outbuf[i];;
|
|
||||||
|
|
||||||
connection->flush();
|
|
||||||
|
|
||||||
string reply = "";
|
|
||||||
|
|
||||||
char buf[257];
|
|
||||||
do { // we simply ignore the http header in the response
|
|
||||||
bzero(buf,257);
|
|
||||||
connection->getline(buf,256);
|
|
||||||
} while( string(buf) != "" && string(buf) != "\r" );
|
|
||||||
|
|
||||||
string tmp;
|
|
||||||
do {
|
|
||||||
tmp = "";
|
|
||||||
(*connection) >> tmp;
|
|
||||||
reply += " "+tmp;
|
|
||||||
} while( tmp.length() );
|
|
||||||
|
|
||||||
this->close();
|
|
||||||
delete connection;
|
|
||||||
|
|
||||||
return reply;
|
|
||||||
};
|
|
||||||
|
|
||||||
iostream * GenericHttpClient::parseUrl() {
|
|
||||||
int protocolend = m_url.find("://");
|
|
||||||
m_protocol = m_url.substr(0,protocolend);
|
|
||||||
if( ! this->checkProtocol(m_protocol) ) return (iostream *)0;
|
|
||||||
|
|
||||||
int hostnameend = m_url.find("/",protocolend+3);
|
|
||||||
m_hostname = m_url.substr(protocolend+3,hostnameend-(protocolend+3));
|
|
||||||
m_port = m_defaultPort;
|
|
||||||
m_path = m_url.substr(hostnameend);
|
|
||||||
int portstart = m_hostname.find(":");
|
|
||||||
if( portstart >= 0 ) {
|
|
||||||
string portstring = m_hostname.substr(portstart+1);
|
|
||||||
|
|
||||||
if( portstring.size() > 0 ) {
|
|
||||||
try {
|
|
||||||
m_port = lexical_cast<int>(portstring.c_str());
|
|
||||||
m_hostname = m_hostname.substr(0,m_hostname.find(":"));
|
|
||||||
} catch(bad_lexical_cast &) { }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return this->getConnection(m_hostname, m_port);
|
|
||||||
};
|
|
||||||
|
|
||||||
GenericHttpClient *createHttpClient(const string &url) {
|
|
||||||
int protocolend = url.find("://");
|
|
||||||
string protocol = url.substr(0,protocolend);
|
|
||||||
if( protocol == "http" ) return (GenericHttpClient *) new HttpClient<HTTP>(url);
|
|
||||||
if( protocol == "https" ) return (GenericHttpClient *) new HttpClient<HTTPS>(url);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
@ -1,163 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Christof Donat *
|
|
||||||
* cdonat@gmx.de *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#include <iosfwd>
|
|
||||||
#include <string>
|
|
||||||
#include <iostream>
|
|
||||||
#include <boost/lexical_cast.hpp>
|
|
||||||
#include <boost/iostreams/stream.hpp>
|
|
||||||
|
|
||||||
#include "sslclient.h"
|
|
||||||
|
|
||||||
#ifndef HSADMIN_HTTPCLIENT
|
|
||||||
#define HSADMIN_HTTPCLIENT
|
|
||||||
|
|
||||||
using std::string;
|
|
||||||
using std::iostream;
|
|
||||||
using std::streamsize;
|
|
||||||
using boost::lexical_cast;
|
|
||||||
using boost::bad_lexical_cast;
|
|
||||||
|
|
||||||
//! A Socket as a Device
|
|
||||||
class TCPDevice : public boost::iostreams::device<boost::iostreams::bidirectional> {
|
|
||||||
public:
|
|
||||||
//! create a TCP-Stream by connecting to the given port at the given address
|
|
||||||
TCPDevice(const string& address, const short int port);
|
|
||||||
//! create a TCP-Stream by connecting to the given port at the given address
|
|
||||||
TCPDevice(const char* address, const short int port);
|
|
||||||
//! create a TCP-Stream from a connected socket - use this with accept
|
|
||||||
TCPDevice(const int socket);
|
|
||||||
//! copy constructor
|
|
||||||
TCPDevice(const TCPDevice& other);
|
|
||||||
//! does not close the socket - use closeSocket before deleting the Device.
|
|
||||||
virtual ~TCPDevice();
|
|
||||||
//! closes the socket
|
|
||||||
void closeSocket();
|
|
||||||
|
|
||||||
//! read n Bytes from socket
|
|
||||||
virtual streamsize read(char* s, streamsize n);
|
|
||||||
//! write n Bytes to socket
|
|
||||||
virtual streamsize write(const char* s, streamsize n);
|
|
||||||
private:
|
|
||||||
void init(const char* address, const short int port);
|
|
||||||
int m_socket;
|
|
||||||
};
|
|
||||||
|
|
||||||
//class SSLDevice;
|
|
||||||
|
|
||||||
const int HTTP = 0;
|
|
||||||
const int HTTPS = 1;
|
|
||||||
|
|
||||||
//! the basic HTTP Client - can only handle POST method.
|
|
||||||
class GenericHttpClient {
|
|
||||||
public:
|
|
||||||
//! initialize HTTP CLient with URL and default Port (usually 80)
|
|
||||||
GenericHttpClient(const string &url, const unsigned short defaultPort);
|
|
||||||
//! Post
|
|
||||||
string post(string postcontent);
|
|
||||||
|
|
||||||
protected:
|
|
||||||
//! get a buffered iostream for the connection - must be overridden by derived classes
|
|
||||||
virtual iostream * getConnection(const string &host, unsigned short port) = 0;
|
|
||||||
//! check if this class can handle the protocol - must be overridden by derived classes
|
|
||||||
virtual bool checkProtocol(const string &protocol) { return false; };
|
|
||||||
//! close the underlying connection
|
|
||||||
virtual void close() = 0;
|
|
||||||
|
|
||||||
private:
|
|
||||||
iostream * parseUrl();
|
|
||||||
const string& m_url;
|
|
||||||
string m_protocol;
|
|
||||||
string m_hostname;
|
|
||||||
string m_path;
|
|
||||||
unsigned short m_port;
|
|
||||||
const unsigned short m_defaultPort;
|
|
||||||
};
|
|
||||||
|
|
||||||
//! This template should usually be used in one of the specialized Versions below.
|
|
||||||
template <int protocol> class HttpClient: public GenericHttpClient {
|
|
||||||
public:
|
|
||||||
HttpClient(const string &url, unsigned short defaultPort = 80): GenericHttpClient(url,defaultPort) {};
|
|
||||||
protected:
|
|
||||||
iostream * getConnection(const string &host, unsigned short port) { return (iostream *)0; };
|
|
||||||
bool checkProtocol(const string &p) { return false; };
|
|
||||||
virtual void close() { };
|
|
||||||
};
|
|
||||||
|
|
||||||
//! a HTTP CLient with a plain TCP socket as transport
|
|
||||||
template <> class HttpClient<HTTP>: public GenericHttpClient {
|
|
||||||
public:
|
|
||||||
//! initialize HTTP CLient with URL and default Port (usually 80)
|
|
||||||
HttpClient(const string &url, unsigned short defaultPort = 80): GenericHttpClient(url,defaultPort), device(0) {};
|
|
||||||
protected:
|
|
||||||
//! get a buffered iostream for the connection
|
|
||||||
iostream * getConnection(const string &host, unsigned short port) {
|
|
||||||
if( device == 0 ) device = new TCPDevice(host,port);
|
|
||||||
return (iostream *) new boost::iostreams::stream<TCPDevice>(*device);
|
|
||||||
}
|
|
||||||
//! check if this class can handle the protocol
|
|
||||||
bool checkProtocol(const string &protocol) { return (protocol == "http"); };
|
|
||||||
//! close the underlying connection
|
|
||||||
virtual void close() { device->closeSocket(); };
|
|
||||||
private:
|
|
||||||
TCPDevice *device;
|
|
||||||
};
|
|
||||||
//! a HTTP CLient with a SSL stream as transport
|
|
||||||
template <> class HttpClient<HTTPS>: public GenericHttpClient {
|
|
||||||
public:
|
|
||||||
//! initialize HTTPS CLient with URL and default Port (usually 443)
|
|
||||||
HttpClient(const string &url, unsigned short defaultPort = 443): GenericHttpClient(url,defaultPort), device(0) {};
|
|
||||||
protected:
|
|
||||||
//! get a buffered iostream for the connection
|
|
||||||
iostream * getConnection(const string &host, unsigned short port) {
|
|
||||||
try {
|
|
||||||
if( device == 0 ) device = new SSLDevice(host,port);
|
|
||||||
return (iostream *) new boost::iostreams::stream<SSLDevice>(*device);
|
|
||||||
} catch( SSLDevice::CertificateError &e ) {
|
|
||||||
if( device != 0 ) {
|
|
||||||
delete(device);
|
|
||||||
device = 0;
|
|
||||||
}
|
|
||||||
std::cerr << e.msg << std::endl;
|
|
||||||
return (iostream *)0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//! check if this class can handle the protocol
|
|
||||||
bool checkProtocol(const string &protocol) { return (protocol == "https"); };
|
|
||||||
//! close the underlying connection
|
|
||||||
virtual void close() { device->closeSocket(); };
|
|
||||||
private:
|
|
||||||
SSLDevice *device;
|
|
||||||
};
|
|
||||||
|
|
||||||
/** \brief get the best HTTP client for the defined Protocol
|
|
||||||
*
|
|
||||||
* returns HttpClient<HTTP> or HttpClient<HTTPS> depending on the protocol
|
|
||||||
*/
|
|
||||||
GenericHttpClient *createHttpClient(const string &uri);
|
|
||||||
|
|
||||||
#else /* HSADMIN_HTTPCLIENT */
|
|
||||||
class TCPDevice;
|
|
||||||
class GenericHttpClient;
|
|
||||||
genericHttpClient *createHttpClient(url);
|
|
||||||
|
|
||||||
extern const int HTTP = 0;
|
|
||||||
extern const int HTTPS = 1;
|
|
||||||
#endif /* HSADMIN_HTTPCLIENT */
|
|
||||||
@ -1,136 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Christof Donat *
|
|
||||||
* cdonat@gmx.de *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#include <boost/filesystem/exception.hpp>
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/filesystem/fstream.hpp>
|
|
||||||
#include <boost/algorithm/string.hpp>
|
|
||||||
#include <boost/lexical_cast.hpp>
|
|
||||||
|
|
||||||
#include <iostream>
|
|
||||||
#include <map>
|
|
||||||
#include <fstream>
|
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
|
|
||||||
#include "logger.h"
|
|
||||||
|
|
||||||
namespace Logger {
|
|
||||||
|
|
||||||
const int FATAL = 1;
|
|
||||||
const int ERROR = 2;
|
|
||||||
const int WARNING = 4;
|
|
||||||
const int DEBUG = 8;
|
|
||||||
const int XML = 16;
|
|
||||||
int levels[6] = { 1, 3, 7, 15, 23, 31 };
|
|
||||||
int level = 1;
|
|
||||||
|
|
||||||
std::map<int,std::string> messages;
|
|
||||||
|
|
||||||
void setLevel(int newlevel) {
|
|
||||||
level = newlevel;
|
|
||||||
if( level > 5 ) level = 5;
|
|
||||||
if( level < 0 ) level = 0;
|
|
||||||
}
|
|
||||||
void incrementLevel() {
|
|
||||||
level++;
|
|
||||||
if( level > 5 ) level = 5;
|
|
||||||
}
|
|
||||||
void decrementLevel() {
|
|
||||||
level--;
|
|
||||||
if( level < 0 ) level = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void log(int type, const std::string text) {
|
|
||||||
int bitmask = levels[level];
|
|
||||||
|
|
||||||
if( type & bitmask )
|
|
||||||
std::cerr << text << std::endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
void insertMessages(std::string filename) {
|
|
||||||
std::ifstream file(filename.c_str(),std::ios::in);
|
|
||||||
if( !file ) return;
|
|
||||||
|
|
||||||
char input[1024];
|
|
||||||
|
|
||||||
while(!file.eof()) {
|
|
||||||
bzero(input,1024);
|
|
||||||
file.getline(input,1023);
|
|
||||||
char *c = input;
|
|
||||||
// ignore whitespace at beginning of line
|
|
||||||
while( *c == ' ' || *c == '\t' ) c++;
|
|
||||||
// lines that dont't begin with a digit are ignored
|
|
||||||
if( *c < '0' || *c > '9' ) continue;
|
|
||||||
char *i = c;
|
|
||||||
while( *c >= '0' && *c <= '9' ) c++;
|
|
||||||
char *j = c;
|
|
||||||
while( *c == ' ' || *c == '\t' ) c++;
|
|
||||||
// the digit istn't followed by a '=' -> ignore this line
|
|
||||||
if( *c != '=' ) continue;
|
|
||||||
// separate number from content
|
|
||||||
*j = '\0';
|
|
||||||
std::string number(i);
|
|
||||||
std::string formatstring(c+1);
|
|
||||||
messages[boost::lexical_cast<int>(number)] = boost::trim_copy(formatstring);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void loadMessages() {
|
|
||||||
std::string lang = getenv("LANG");
|
|
||||||
std::string priv = getenv("HOME");
|
|
||||||
|
|
||||||
try {
|
|
||||||
boost::filesystem::path general("/etc/hsadminc.messages");
|
|
||||||
if( boost::filesystem::exists(general) && !boost::filesystem::is_directory(general) )
|
|
||||||
insertMessages(general.native());
|
|
||||||
} catch(boost::filesystem::filesystem_error) {}
|
|
||||||
|
|
||||||
try {
|
|
||||||
boost::filesystem::path generalLang("/etc/hsadminc.messages."+lang);
|
|
||||||
if( boost::filesystem::exists(generalLang) && !boost::filesystem::is_directory(generalLang) )
|
|
||||||
insertMessages(generalLang.native());
|
|
||||||
} catch(boost::filesystem::filesystem_error) {}
|
|
||||||
|
|
||||||
try {
|
|
||||||
boost::filesystem::path p( priv + "/.hsadmin.messages" );
|
|
||||||
if( boost::filesystem::exists(p) && !boost::filesystem::is_directory(p) )
|
|
||||||
insertMessages(p.native());
|
|
||||||
} catch(boost::filesystem::filesystem_error) {}
|
|
||||||
|
|
||||||
try {
|
|
||||||
boost::filesystem::path pLang( priv + "/.hsadmin.messages."+lang );
|
|
||||||
if( boost::filesystem::exists(pLang) && !boost::filesystem::is_directory(pLang) )
|
|
||||||
insertMessages(pLang.native());
|
|
||||||
} catch(boost::filesystem::filesystem_error) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string getErrnoMessage(int e) {
|
|
||||||
if( messages.empty() ) loadMessages();
|
|
||||||
std::map<int,std::string>::iterator i = messages.find(e);
|
|
||||||
if( i != messages.end() ) return i->second;
|
|
||||||
else return std::string("");
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string getMessageFormatString(const message msg) {
|
|
||||||
return getErrnoMessage((int)msg);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,68 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Christof Donat *
|
|
||||||
* cdonat@gmx.de *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#ifndef HSADMIN_LOGGER
|
|
||||||
#define HSADMIN_LOGGER
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
|
|
||||||
//! a simple logger
|
|
||||||
namespace Logger {
|
|
||||||
extern const int FATAL;
|
|
||||||
extern const int ERROR;
|
|
||||||
extern const int WARNING;
|
|
||||||
extern const int DEBUG;
|
|
||||||
extern const int XML;
|
|
||||||
|
|
||||||
extern int levels[6];
|
|
||||||
extern int level;
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
CouldNotOpenFile = 1001,
|
|
||||||
NoBodyInResponse = 1002,
|
|
||||||
CantResolveHostname = 1003,
|
|
||||||
CantOpenSocket = 1004,
|
|
||||||
CantConnetcToHost = 1005,
|
|
||||||
ServerErrorCode = 1006,
|
|
||||||
UnknownCallbackInXMLParser = 1007,
|
|
||||||
ConnectionFailed = 1008,
|
|
||||||
ErrorWithTicketCommand = 1009,
|
|
||||||
ErrorReadingTicket = 1010
|
|
||||||
} message;
|
|
||||||
|
|
||||||
//! change the loglevel - used by VerbosityOption
|
|
||||||
void setLevel(int newlevel);
|
|
||||||
//! increment the loglevel - used by VerbosityOption
|
|
||||||
void incrementLevel();
|
|
||||||
//! decrement theloglevel - used by QuietOption
|
|
||||||
void decrementLevel();
|
|
||||||
|
|
||||||
//! do actualy output loginfo
|
|
||||||
void log(int type, const std::string text);
|
|
||||||
|
|
||||||
//! get a message format string for a defined Message Type; use boost::format to insert Values
|
|
||||||
std::string getMessageFormatString(const message msg);
|
|
||||||
//! get an appropriate Message for an errno.
|
|
||||||
std::string getErrnoMessage(int e);
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* HSADMIN_LOGGER */
|
|
||||||
@ -1,171 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Christof Donat *
|
|
||||||
* cdonat@gmx.de *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#include "sslclient.h"
|
|
||||||
#include "logger.h"
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <netinet/in.h>
|
|
||||||
#include <arpa/inet.h>
|
|
||||||
#include <netdb.h>
|
|
||||||
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/lexical_cast.hpp>
|
|
||||||
|
|
||||||
#include <gnutls/x509.h>
|
|
||||||
|
|
||||||
using std::string;
|
|
||||||
using std::streamsize;
|
|
||||||
using boost::lexical_cast;
|
|
||||||
using boost::bad_lexical_cast;
|
|
||||||
|
|
||||||
int SSLDevice::countInstances = 0;
|
|
||||||
|
|
||||||
SSLDevice::SSLDevice(const string& address, const short int port): m_session(0) {
|
|
||||||
this->init(address.c_str(),port);
|
|
||||||
}
|
|
||||||
SSLDevice::SSLDevice(const char* address, const short int port): m_session(0) {
|
|
||||||
this->init(address,port);
|
|
||||||
}
|
|
||||||
|
|
||||||
void SSLDevice::init(const char* address, const short int port) {
|
|
||||||
struct sockaddr_in addr;
|
|
||||||
bzero(&addr,sizeof(addr));
|
|
||||||
addr.sin_family = AF_INET;
|
|
||||||
if( (addr.sin_addr.s_addr = inet_addr(address)) == INADDR_NONE ) {
|
|
||||||
struct hostent* hp = gethostbyname(address);
|
|
||||||
if( hp == 0 ) throw("can't resolve hostname '"+string(address)+"'");
|
|
||||||
bcopy(hp->h_addr, (char*) &addr.sin_addr, hp->h_length);
|
|
||||||
}
|
|
||||||
addr.sin_port = htons(port);
|
|
||||||
|
|
||||||
if( (m_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0 ) throw(string("can't open socket"));
|
|
||||||
if( ::connect(m_socket, (struct sockaddr*) &addr, sizeof(addr)) < 0 ) {
|
|
||||||
::close(m_socket);
|
|
||||||
throw("can't connect to '"+string(address)+"' port "+(lexical_cast<string>(port)));
|
|
||||||
}
|
|
||||||
|
|
||||||
const int cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
|
|
||||||
|
|
||||||
m_session = new gnutls_session;
|
|
||||||
|
|
||||||
if( countInstances == 0 ) gnutls_global_init();
|
|
||||||
countInstances++;
|
|
||||||
|
|
||||||
gnutls_certificate_allocate_credentials(&m_xcred);
|
|
||||||
gnutls_certificate_set_x509_trust_file(m_xcred, "ca.pem", GNUTLS_X509_FMT_PEM);
|
|
||||||
|
|
||||||
gnutls_init(m_session,GNUTLS_CLIENT);
|
|
||||||
|
|
||||||
gnutls_set_default_priority(*m_session);
|
|
||||||
|
|
||||||
gnutls_credentials_set(*m_session, GNUTLS_CRD_CERTIFICATE, m_xcred);
|
|
||||||
|
|
||||||
gnutls_transport_set_ptr(*m_session, (gnutls_transport_ptr)&m_socket);
|
|
||||||
|
|
||||||
if( gnutls_handshake(*m_session) < 0 )
|
|
||||||
throw(string(gnutls_protocol_get_name(gnutls_protocol_get_version(*m_session)))+" Handshake failed");
|
|
||||||
|
|
||||||
verify_certificate( *m_session, address);
|
|
||||||
}
|
|
||||||
SSLDevice::SSLDevice(const SSLDevice& other) : m_session(other.m_session), m_socket(other.m_socket), m_xcred(other.m_xcred) { }
|
|
||||||
SSLDevice::~SSLDevice() { }
|
|
||||||
|
|
||||||
void SSLDevice::closeSocket() {
|
|
||||||
gnutls_bye(*m_session, GNUTLS_SHUT_RDWR);
|
|
||||||
gnutls_certificate_free_credentials(m_xcred);
|
|
||||||
::close(m_socket);
|
|
||||||
gnutls_deinit(*m_session);
|
|
||||||
delete(m_session);
|
|
||||||
|
|
||||||
countInstances--;
|
|
||||||
if( countInstances == 0 ) gnutls_global_deinit();
|
|
||||||
}
|
|
||||||
|
|
||||||
streamsize SSLDevice::read(char* s, streamsize n) { return (streamsize)gnutls_record_recv(*m_session,(void*)s,(size_t)n); }
|
|
||||||
streamsize SSLDevice::write(const char* s, streamsize n) {
|
|
||||||
/*streamsize i = (streamsize)gnutls_record_send(*m_session,(const void*)s,(size_t)n);
|
|
||||||
Logger::log(Logger::DEBUG,string("sending ")+boost::lexical_cast<string>(i)+" von "+boost::lexical_cast<string>(n)+" bytes: \n---\n"+s+"\n---\n");*/
|
|
||||||
return (streamsize)gnutls_record_send(*m_session,(const void*)s,(size_t)n); //i;
|
|
||||||
}
|
|
||||||
|
|
||||||
void SSLDevice::verify_certificate( gnutls_session session, string hostname) {
|
|
||||||
boost::filesystem::path general("/etc/hsadminc.cert");
|
|
||||||
if( boost::filesystem::exists(general) && !boost::filesystem::is_directory(general) )
|
|
||||||
gnutls_certificate_set_x509_trust_file (m_xcred, general.native().c_str(), GNUTLS_X509_FMT_PEM);
|
|
||||||
//string privfilename = getenv("HOME");
|
|
||||||
string priv = getenv("HOME");
|
|
||||||
boost::filesystem::path p( priv + "/.hsadmin.cert" );
|
|
||||||
//p /= ".hsadminc.conf";
|
|
||||||
|
|
||||||
if( boost::filesystem::exists(p) && !boost::filesystem::is_directory(p) )
|
|
||||||
gnutls_certificate_set_x509_trust_file (m_xcred, p.native().c_str(), GNUTLS_X509_FMT_PEM);
|
|
||||||
//gnutls_certificate_set_x509_trust_file (m_xcred, const char * cafile, PEM)
|
|
||||||
|
|
||||||
unsigned int status = 0;//gnutls_certificate_verify_peers(*m_session);
|
|
||||||
/*if( gnutls_certificate_verify_peers2(*m_session, &status) < 0 )
|
|
||||||
throw(string("Error while verifying certificate"));*/
|
|
||||||
|
|
||||||
string tval = "Certificate Verification failed: ";
|
|
||||||
if( status & GNUTLS_CERT_INVALID ) { throw(tval+"The certificate is not trustet"); }
|
|
||||||
if( status & GNUTLS_CERT_SIGNER_NOT_FOUND ) { throw(tval+"The certificate has no known Issuer"); }
|
|
||||||
if( status & GNUTLS_CERT_REVOKED ) { throw(tval+"The certificate has been revoked"); }
|
|
||||||
|
|
||||||
// the further checks are only valid for X509 certificates
|
|
||||||
if ( gnutls_certificate_type_get(session) != GNUTLS_CRT_X509) return;
|
|
||||||
|
|
||||||
const gnutls_datum* cert_list;
|
|
||||||
unsigned int cert_list_size;
|
|
||||||
gnutls_x509_crt cert;
|
|
||||||
|
|
||||||
if ( gnutls_x509_crt_init(&cert) < 0) throw(tval+"error in initialization");
|
|
||||||
|
|
||||||
cert_list = gnutls_certificate_get_peers(session, &cert_list_size);
|
|
||||||
if ( cert_list == NULL ) throw(tval+"no certificate found");
|
|
||||||
|
|
||||||
bool failed = false;
|
|
||||||
string tReason = "";
|
|
||||||
for( int i = 0; i < cert_list_size-1; i++ ) {
|
|
||||||
bool failed = false;
|
|
||||||
|
|
||||||
if ( gnutls_x509_crt_import( cert, &cert_list[0], GNUTLS_X509_FMT_DER) < 0)
|
|
||||||
throw(tval+"error parsing certificate Number "+lexical_cast<string>(i));
|
|
||||||
|
|
||||||
if ( gnutls_x509_crt_get_expiration_time(cert) < time(0) ) {
|
|
||||||
tReason = "The certificate has expired";
|
|
||||||
failed = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( gnutls_x509_crt_get_activation_time(cert) > time(0) ) {
|
|
||||||
tReason = "The certificate is not yet activated";
|
|
||||||
failed = true;
|
|
||||||
}
|
|
||||||
if ( !gnutls_x509_crt_check_hostname(cert,hostname.c_str()) ) {
|
|
||||||
tReason = "The certificate’s owner does not match hostname ’";
|
|
||||||
tReason += hostname +"'";
|
|
||||||
failed = true;
|
|
||||||
}
|
|
||||||
gnutls_x509_crt_deinit(cert);
|
|
||||||
|
|
||||||
if( !failed ) break;
|
|
||||||
}
|
|
||||||
if( failed ) throw(tval+tReason);
|
|
||||||
}
|
|
||||||
@ -1,73 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Christof Donat *
|
|
||||||
* cdonat@gmx.de *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#include <iosfwd>
|
|
||||||
#include <string>
|
|
||||||
#include <iostream>
|
|
||||||
#include <boost/iostreams/stream.hpp>
|
|
||||||
|
|
||||||
#include <gnutls/gnutls.h>
|
|
||||||
|
|
||||||
#ifndef HSADMIN_SSLCLIENT
|
|
||||||
#define HSADMIN_SSLCLIENT
|
|
||||||
|
|
||||||
using std::string;
|
|
||||||
using std::streamsize;
|
|
||||||
|
|
||||||
//! A SSL connection as a Device
|
|
||||||
class SSLDevice : public boost::iostreams::device<boost::iostreams::bidirectional> {
|
|
||||||
public:
|
|
||||||
//! create a SSL-Stream by connecting to the given port at the given address and checking the Certificate
|
|
||||||
SSLDevice(const string& address, const short int port);
|
|
||||||
//! create a SSL-Stream by connecting to the given port at the given address and checking the Certificate
|
|
||||||
SSLDevice(const char* address, const short int port);
|
|
||||||
//! copy constructor
|
|
||||||
SSLDevice(const SSLDevice& other);
|
|
||||||
//! does not close the SSL strem - use closeSocket before deleting the Device.
|
|
||||||
virtual ~SSLDevice();
|
|
||||||
//! closes the SSL Stream
|
|
||||||
void closeSocket();
|
|
||||||
|
|
||||||
//! read n Bytes from SSL Stream
|
|
||||||
virtual streamsize read(char* s, streamsize n);
|
|
||||||
//! write n Bytes to SSL stream
|
|
||||||
virtual streamsize write(const char* s, streamsize n);
|
|
||||||
|
|
||||||
//! indicates an error while checking the certificate
|
|
||||||
class CertificateError {
|
|
||||||
public:
|
|
||||||
CertificateError(const string &s): msg(s) {};
|
|
||||||
CertificateError(const char* s): msg(s) {};
|
|
||||||
string msg;
|
|
||||||
};
|
|
||||||
private:
|
|
||||||
void init(const char* address, const short int port);
|
|
||||||
void verify_certificate( gnutls_session session, string hostname);
|
|
||||||
|
|
||||||
gnutls_session *m_session;
|
|
||||||
gnutls_certificate_credentials m_xcred;
|
|
||||||
int m_socket;
|
|
||||||
|
|
||||||
static int countInstances;
|
|
||||||
};
|
|
||||||
|
|
||||||
#else /* HSADMIN_SSLCLIENT */
|
|
||||||
class SSLDevice;
|
|
||||||
#endif /* HSADMIN_SSLCLIENT */
|
|
||||||
@ -1,502 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Christof Donat *
|
|
||||||
* cdonat@gmx.de *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#include "transaction.h"
|
|
||||||
#include "xmlparser.h"
|
|
||||||
#include "httpclient.h"
|
|
||||||
#include <boost/lexical_cast.hpp>
|
|
||||||
#include <boost/regex.hpp>
|
|
||||||
#include <boost/format.hpp>
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <netinet/in.h>
|
|
||||||
#include <arpa/inet.h>
|
|
||||||
#include <netdb.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
using boost::lexical_cast;
|
|
||||||
using boost::bad_lexical_cast;
|
|
||||||
using namespace xmlParser;
|
|
||||||
|
|
||||||
Transaction::Transaction(vector<string> options) :
|
|
||||||
abstractcommandlineparser::CmdLineParser<commandline::Parameters,commandline::parsedParameters>(options),
|
|
||||||
m_nextAttributeValue(""),
|
|
||||||
m_globalFault(false),
|
|
||||||
m_currentCall(0) {
|
|
||||||
if(!this->m_parseSuccessful) return;
|
|
||||||
|
|
||||||
vector<shared_ptr<commandline::callParameter> >& calls = m_parsed->m_call;
|
|
||||||
|
|
||||||
for( vector<shared_ptr<commandline::callParameter> >::iterator c = calls.begin(); c != calls.end(); c++ ) {
|
|
||||||
shared_ptr<commandline::callParameter> call = *c;
|
|
||||||
|
|
||||||
vector<shared_ptr<commandline::orderParameter> >::iterator orderhere = call->m_order.end();
|
|
||||||
if( call->m_globalOrderIndex >= 0 ) orderhere = call->m_order.begin()+call->m_globalOrderIndex;
|
|
||||||
|
|
||||||
call->m_order.insert( orderhere, m_parsed->m_globalOrder.begin(), m_parsed->m_globalOrder.end() );
|
|
||||||
call->m_where.insert( call->m_where.end(), m_parsed->m_only.begin(), m_parsed->m_only.end() );
|
|
||||||
call->m_set.insert( call->m_set.end(), m_parsed->m_setall.begin(), m_parsed->m_setall.end() );
|
|
||||||
call->m_unset.insert( call->m_unset.end(), m_parsed->m_unsetall.begin(), m_parsed->m_unsetall.end() );
|
|
||||||
|
|
||||||
if( m_parsed->m_ignoreerrors ) call->m_ignoreerror = true;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
void Transaction::operator()(shared_ptr<ConfigFileParser> cfgfile) {
|
|
||||||
|
|
||||||
class {
|
|
||||||
public:
|
|
||||||
void post(string &url) {
|
|
||||||
GenericHttpClient * client = createHttpClient(url);
|
|
||||||
m_response = client->post(m_request);
|
|
||||||
};
|
|
||||||
|
|
||||||
void execCall(Transaction *t, string &username, string &url, shared_ptr<ConfigFileParser> cfgfile) {
|
|
||||||
m_request = t->getParsed()->toXML(username,cfgfile);
|
|
||||||
Logger::log(Logger::XML,"--XML request--\n"+m_request+"\n---");
|
|
||||||
|
|
||||||
this->post(url);
|
|
||||||
|
|
||||||
ResponseParser parse;
|
|
||||||
if( !parse(m_response, t) ) Logger::log(Logger::XML,"parse error");
|
|
||||||
Logger::log(Logger::XML,"response parsed:");
|
|
||||||
|
|
||||||
if(Logger::XML && Logger::levels[Logger::level]) logNode(t->m_docelem,0);
|
|
||||||
}
|
|
||||||
|
|
||||||
void logNode(Node* node, int ind) {
|
|
||||||
Text *text;
|
|
||||||
Element *elm;
|
|
||||||
string indent = "";
|
|
||||||
for( int j = 0; j < ind; j++ ) indent += " ";
|
|
||||||
string attributes;
|
|
||||||
|
|
||||||
switch(node->m_type) {
|
|
||||||
case ELEMENT:
|
|
||||||
elm = (Element*)node;
|
|
||||||
for(map<string,string>::iterator i = elm->m_attributes.begin(); i != elm->m_attributes.end(); i++)
|
|
||||||
attributes += " "+(i->first)+"=\""+(i->second)+"\"";
|
|
||||||
Logger::log(Logger::XML,indent+"<"+elm->m_name+attributes+">");
|
|
||||||
for( vector<Node*>::iterator i = elm->m_nodes.begin(); i != elm->m_nodes.end(); i++ )
|
|
||||||
logNode(*i,ind+1);
|
|
||||||
Logger::log(Logger::XML,indent+"</"+elm->m_name+">");
|
|
||||||
break;
|
|
||||||
case TEXT:
|
|
||||||
text = (Text*)node;
|
|
||||||
Logger::log(Logger::XML,indent+text->m_content);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
int connectToHost(const string hostname, const int port) const {
|
|
||||||
int sock;
|
|
||||||
|
|
||||||
struct sockaddr_in server_addr;
|
|
||||||
server_addr.sin_family = AF_INET;
|
|
||||||
if( (server_addr.sin_addr.s_addr = inet_addr(hostname.c_str())) == INADDR_NONE ) {
|
|
||||||
struct hostent* hp = gethostbyname(hostname.c_str());
|
|
||||||
if( hp == 0 ) {
|
|
||||||
string msg = Logger::getMessageFormatString(Logger::CantResolveHostname);
|
|
||||||
boost::format fmt(msg);
|
|
||||||
fmt % hostname;
|
|
||||||
Logger::log(Logger::FATAL,fmt.str());
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
bcopy(hp->h_addr, (char*) &server_addr.sin_addr, hp->h_length);
|
|
||||||
}
|
|
||||||
server_addr.sin_port = htons(port);
|
|
||||||
|
|
||||||
if( (sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0 ) {
|
|
||||||
Logger::log(Logger::FATAL,Logger::getMessageFormatString(Logger::CantOpenSocket));
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
if( connect(sock, (struct sockaddr*) &server_addr, sizeof(server_addr)) < 0 ) {
|
|
||||||
string msg = Logger::getMessageFormatString(Logger::CantConnetcToHost);
|
|
||||||
boost::format fmt(msg);
|
|
||||||
fmt % hostname % port;
|
|
||||||
Logger::log(Logger::FATAL,fmt.str());
|
|
||||||
close(sock);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
return sock;
|
|
||||||
}
|
|
||||||
|
|
||||||
string m_request;
|
|
||||||
string m_response;
|
|
||||||
} XMLRPCrequest;
|
|
||||||
|
|
||||||
|
|
||||||
string username = "";
|
|
||||||
ConfigFileParser::config cfg = cfgfile->getConfig(username);
|
|
||||||
string url = cfg.server;
|
|
||||||
username = this->getUser();
|
|
||||||
cfg = cfgfile->getConfig(username);
|
|
||||||
if( cfg.server != "" ) url = cfg.server;
|
|
||||||
|
|
||||||
Logger::log(Logger::DEBUG,"now I know which Config to use");
|
|
||||||
|
|
||||||
XMLRPCrequest.execCall(this,username,url,cfgfile);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// XML Parser stuff
|
|
||||||
Element* Transaction::stepin(int count,Element* value) {
|
|
||||||
if( count<= 0 ) return value;
|
|
||||||
for( ; count > 0; count-- )
|
|
||||||
if(value->m_nodes[0]->m_type == xmlParser::ELEMENT ) value = (Element*)value->m_nodes[0];
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
string Transaction::getContent(Element* value) {
|
|
||||||
while( value->m_nodes.size() > 0 && value->m_nodes[0]->m_type == xmlParser::ELEMENT ) value = (Element*)value->m_nodes[0];
|
|
||||||
|
|
||||||
if( value->m_nodes.size() > 0 ) {
|
|
||||||
Text* txt = (Text*)value->m_nodes[0];
|
|
||||||
|
|
||||||
if( value->m_name == "boolean") {
|
|
||||||
int b = boost::lexical_cast<int>(replaceEntities(txt->m_content));
|
|
||||||
return (b == 0)?"false":"true";
|
|
||||||
} else if( value->m_name == "dateTime.iso8601") {
|
|
||||||
string datestring = replaceEntities(txt->m_content);
|
|
||||||
string year = datestring.substr(0,4);
|
|
||||||
string month = datestring.substr(4,2);
|
|
||||||
string day = datestring.substr(6,2);
|
|
||||||
string hour = datestring.substr(9,2);
|
|
||||||
string minute= datestring.substr(12,2);
|
|
||||||
string second= datestring.substr(15,2);
|
|
||||||
return day+"."+month+"."+year+" "+hour+":"+minute+":"+second;
|
|
||||||
} else if( value->m_name == "base64") {
|
|
||||||
string encoded = replaceEntities(txt->m_content);
|
|
||||||
string decoded;
|
|
||||||
char next = '\0';
|
|
||||||
int shift = 0;
|
|
||||||
while( encoded.size() ) {
|
|
||||||
int d = encoded[0];
|
|
||||||
encoded = encoded.substr(1,encoded.size()-1);
|
|
||||||
if ( d >= 'A' && d <= 'Z') d -= 'A';
|
|
||||||
else if ( d >= 'a' && d <= 'z') d = (d-'a')+26;
|
|
||||||
else if ( d >= '0' && d <= '9') d = (d-'0')+52;
|
|
||||||
else if ( d == '+') d = 62;
|
|
||||||
else if ( d == '/') d = 63;
|
|
||||||
else continue;
|
|
||||||
|
|
||||||
next += d << shift;
|
|
||||||
if( !shift ) { decoded += (char)(next&255); next = next >> 8; }
|
|
||||||
|
|
||||||
shift = (shift-2)%8;
|
|
||||||
}
|
|
||||||
if( shift ) decoded += next;
|
|
||||||
return decoded;
|
|
||||||
} else {
|
|
||||||
return replaceEntities(txt->m_content);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return string("");
|
|
||||||
}
|
|
||||||
|
|
||||||
void Transaction::handleElem(Element * elem) {
|
|
||||||
if( m_tagstack.size() == 0 ) {
|
|
||||||
m_docelem = elem;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Element *array, *data;
|
|
||||||
int tab = 8;
|
|
||||||
|
|
||||||
switch( m_tagstack.size() ) {
|
|
||||||
case 6: // fill next call
|
|
||||||
if(elem->m_name != "value" ) break;
|
|
||||||
array = (Element*)(elem->m_nodes[0]);
|
|
||||||
|
|
||||||
if( array->m_name == "struct" ) {
|
|
||||||
map<string,string> errorstruct;
|
|
||||||
if(array->m_nodes.size() != 0) for(vector<Node*>::iterator n = array->m_nodes.begin(); n != array->m_nodes.end(); n++) {
|
|
||||||
Element* member = (Element*)(*n);
|
|
||||||
if(member->m_nodes.size() >= 2) {
|
|
||||||
Element *name, *value;
|
|
||||||
name = (Element*)member->m_nodes[0];
|
|
||||||
if( name->m_name == "value" ) {
|
|
||||||
value = name;
|
|
||||||
name = (Element*)member->m_nodes[1];
|
|
||||||
} else
|
|
||||||
value = (Element*)member->m_nodes[1];
|
|
||||||
|
|
||||||
while( name->m_nodes.size() > 0 && name->m_nodes[0]->m_type == xmlParser::ELEMENT ) name = (Element*)name->m_nodes[0];
|
|
||||||
while( value->m_nodes.size() > 0 && value->m_nodes[0]->m_type == xmlParser::ELEMENT ) value = (Element*)value->m_nodes[0];
|
|
||||||
if( value->m_nodes.size() > 0 && name->m_nodes.size() > 0 ) {
|
|
||||||
string namtxt = getContent(name);
|
|
||||||
string valtxt = getContent(value);
|
|
||||||
errorstruct[namtxt] = valtxt;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
string msg = Logger::getMessageFormatString(Logger::ServerErrorCode);
|
|
||||||
|
|
||||||
int errnum = boost::lexical_cast<int>(errorstruct["errorcode"]);
|
|
||||||
string errorstring = Logger::getErrnoMessage(errnum);
|
|
||||||
if( errorstring != "" ) errorstruct["errorstring"] = errorstring;
|
|
||||||
|
|
||||||
boost::format fmt(msg);
|
|
||||||
fmt % errorstruct["errorcode"] % errorstruct["errorstring"];
|
|
||||||
Logger::log(Logger::ERROR,fmt.str());
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
data = (Element*)(array->m_nodes[0]);
|
|
||||||
|
|
||||||
if(data->m_nodes.size() != 0) {
|
|
||||||
vector<string> headlines;
|
|
||||||
int tabpos = 0;
|
|
||||||
vector<int> tabstops;
|
|
||||||
|
|
||||||
Element* headlinesdata = stepin(3,data);
|
|
||||||
|
|
||||||
if( m_parsed->m_call[m_currentCall]->m_display == "" ) {
|
|
||||||
if(headlinesdata->m_nodes.size() != 0) for(vector<Node*>::iterator in = headlinesdata->m_nodes.begin(); in != headlinesdata->m_nodes.end(); in++) {
|
|
||||||
string output = "";
|
|
||||||
if((*in)->m_type == xmlParser::ELEMENT ) {
|
|
||||||
output = getContent((Element*)(*in));
|
|
||||||
} else {
|
|
||||||
Text* txt = (Text*)(*in);
|
|
||||||
output = replaceEntities(txt->m_content);
|
|
||||||
}
|
|
||||||
std::cout << output;
|
|
||||||
tabstops.push_back(tabpos);
|
|
||||||
tabpos += output.length();
|
|
||||||
if( in+1 != headlinesdata->m_nodes.end() )do {
|
|
||||||
std::cout << " ";
|
|
||||||
tabpos++;
|
|
||||||
} while( tabpos % tab );
|
|
||||||
}
|
|
||||||
std::cout << "\n";
|
|
||||||
for(;tabpos;tabpos--) std::cout << "-";
|
|
||||||
std::cout << "\n";
|
|
||||||
} else {
|
|
||||||
if(headlinesdata->m_nodes.size() != 0) for(vector<Node*>::iterator in = headlinesdata->m_nodes.begin(); in != headlinesdata->m_nodes.end(); in++) {
|
|
||||||
string headline = getContent((Element*)(*in));
|
|
||||||
if( headline != "" ) headlines.push_back( headline );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Element* contentvalue;
|
|
||||||
if(data->m_nodes[1]->m_type == xmlParser::ELEMENT ) contentvalue = (Element*)data->m_nodes[1];
|
|
||||||
else contentvalue = data;
|
|
||||||
Element* contentdata = stepin(2,contentvalue);
|
|
||||||
|
|
||||||
if(contentdata->m_nodes.size() != 0) for(vector<Node*>::iterator n = contentdata->m_nodes.begin(); n != contentdata->m_nodes.end(); n++) {
|
|
||||||
if( m_parsed->m_call[m_currentCall]->m_display == "" ) {
|
|
||||||
tabpos = 0;
|
|
||||||
int i = 0;
|
|
||||||
|
|
||||||
Element* innerdata = stepin(2,(Element*)(*n));
|
|
||||||
if(innerdata->m_nodes.size() != 0) for(vector<Node*>::iterator in = innerdata->m_nodes.begin(); in != innerdata->m_nodes.end(); in++) {
|
|
||||||
string oputput = getContent((Element*)(*in));
|
|
||||||
|
|
||||||
while( tabpos < tabstops[i] ) {
|
|
||||||
std::cout << " "; tabpos++;
|
|
||||||
}
|
|
||||||
std::cout << oputput;
|
|
||||||
tabpos += oputput.length();
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
std::cout << "\n";
|
|
||||||
} else {
|
|
||||||
map<string,string> values;
|
|
||||||
int i = 0;
|
|
||||||
|
|
||||||
Element* innerdata = stepin(2,(Element*)(*n));
|
|
||||||
if(innerdata->m_nodes.size() != 0) for(vector<Node*>::iterator in = innerdata->m_nodes.begin(); in != innerdata->m_nodes.end(); in++) {
|
|
||||||
string oputput = getContent((Element*)(*in));
|
|
||||||
|
|
||||||
if( oputput != "" ) {
|
|
||||||
values[headlines[i]] = oputput;
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
std::cout << m_parsed->m_call[m_currentCall]->evalDisplay(values);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
m_currentCall++;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
m_tagstack.top().m_nodes.push_back(elem);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Transaction::handleGlobalFaultElem(xmlParser::Element * elem) {
|
|
||||||
if( m_tagstack.size() == 0 ) {
|
|
||||||
m_docelem = elem;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Text *txt;
|
|
||||||
switch( m_tagstack.size() ) {
|
|
||||||
case 5:
|
|
||||||
if(elem->m_name == "value" )
|
|
||||||
Logger::log(Logger::FATAL,getContent(elem));
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
m_tagstack.top().m_nodes.push_back(elem);
|
|
||||||
}
|
|
||||||
|
|
||||||
string Transaction::replaceEntities(const string &input) {
|
|
||||||
string rval;
|
|
||||||
for( string::const_iterator i = input.begin(); i != input.end(); i++ ) {
|
|
||||||
if( *i != '&' ) rval += *i;
|
|
||||||
else {
|
|
||||||
string tmp;
|
|
||||||
int j;
|
|
||||||
|
|
||||||
for( j = 1; *(i+j) != ';' && i+j != input.end(); j++ ) tmp += *(i+j);
|
|
||||||
|
|
||||||
if( *(i+j) != ';' ) { rval += "&"; continue; }
|
|
||||||
|
|
||||||
if( tmp == "amp" ) {
|
|
||||||
rval += "&";
|
|
||||||
i+=j;
|
|
||||||
} else if( tmp == "gt" ) {
|
|
||||||
rval += ">";
|
|
||||||
i+=j;
|
|
||||||
} else if( tmp == "lt" ) {
|
|
||||||
rval += "<";
|
|
||||||
i+=j;
|
|
||||||
} else if( tmp == "quot" ) {
|
|
||||||
rval += "\"";
|
|
||||||
i+=j;
|
|
||||||
} else if( tmp == "apos" ) {
|
|
||||||
rval += "'";
|
|
||||||
i+=j;
|
|
||||||
} else if( tmp[0] == '#' ) {
|
|
||||||
if( tmp[1] != 'x' ) {
|
|
||||||
wchar_t value[2];
|
|
||||||
value[0] = lexical_cast<int>(tmp.substr(1));
|
|
||||||
value[1] = 0;
|
|
||||||
char u[255];
|
|
||||||
bzero(u,255);
|
|
||||||
|
|
||||||
wcstombs(u,value,254);
|
|
||||||
rval += u;
|
|
||||||
i+=j;
|
|
||||||
} else {
|
|
||||||
wchar_t value[2];
|
|
||||||
value[0] = 0;
|
|
||||||
value[1] = 0;
|
|
||||||
if ( tmp[2] >= '0' && tmp[2] <= '9' ) value[0] = tmp[2]-'0';
|
|
||||||
else if( tmp[2] >= 'a' && tmp[2] <= 'f' ) value[0] = tmp[2]-'a';
|
|
||||||
else if( tmp[2] >= 'A' && tmp[2] <= 'F' ) value[0] = tmp[2]-'A';
|
|
||||||
else { rval += "&"; continue;}
|
|
||||||
value[0] = value[0] << 4;
|
|
||||||
if ( tmp[3] >= '0' && tmp[3] <= '9' ) value[0] += tmp[3]-'0';
|
|
||||||
else if( tmp[3] >= 'a' && tmp[3] <= 'f' ) value[0] += tmp[3]-'a';
|
|
||||||
else if( tmp[3] >= 'A' && tmp[3] <= 'F' ) value[0] += tmp[3]-'A';
|
|
||||||
else { rval += "&"; continue; }
|
|
||||||
char u[255];
|
|
||||||
bzero(u,255);
|
|
||||||
|
|
||||||
wcstombs(u,value,254);
|
|
||||||
rval += u;
|
|
||||||
i+=j;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
rval += "&";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return rval;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool Transaction::operator()(int type, string content) {
|
|
||||||
string tmp;
|
|
||||||
Element elem, currentelem;
|
|
||||||
Text text;
|
|
||||||
|
|
||||||
switch( type ) {
|
|
||||||
case responseParserHook::ELEMENT:
|
|
||||||
break;
|
|
||||||
case responseParserHook::ATTRIBUTE:
|
|
||||||
m_nextAttributeList[content] = m_nextAttributeValue;
|
|
||||||
m_nextAttributeValue = "";
|
|
||||||
break;
|
|
||||||
case responseParserHook::TEXT:
|
|
||||||
if( m_tagstack.size() ) {
|
|
||||||
m_tagstack.top().m_nodes.push_back(new Text(content));
|
|
||||||
} else return false;
|
|
||||||
break;
|
|
||||||
case responseParserHook::CDATA:
|
|
||||||
if( m_tagstack.size() ) {
|
|
||||||
m_tagstack.top().m_nodes.push_back(new Text(content));
|
|
||||||
} else return false;
|
|
||||||
break;
|
|
||||||
case responseParserHook::PROCESSING_INSTRUCTION:
|
|
||||||
if( m_nextAttributeList["version"] != "1.0" || content != "xml" ) return false;
|
|
||||||
tmp = "";
|
|
||||||
for(map<string,string>::iterator i = m_nextAttributeList.begin(); i != m_nextAttributeList.end(); i++)
|
|
||||||
tmp += " "+(i->first)+"="+(i->second);
|
|
||||||
m_nextAttributeList.clear();
|
|
||||||
break;
|
|
||||||
case responseParserHook::COMMENT:
|
|
||||||
break;
|
|
||||||
case responseParserHook::DOCUMENT:
|
|
||||||
break;
|
|
||||||
case responseParserHook::START_ELEMENT:
|
|
||||||
if(m_tagstack.size() == 1 && content == "fault") m_globalFault = true;
|
|
||||||
elem = Element(content,m_nextAttributeList,vector<Node*>());
|
|
||||||
m_nextAttributeList.clear();
|
|
||||||
m_tagstack.push(elem);
|
|
||||||
break;
|
|
||||||
case responseParserHook::END_ELEMENT:
|
|
||||||
currentelem = m_tagstack.top();
|
|
||||||
m_tagstack.pop();
|
|
||||||
if( currentelem.m_name != content ) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if( !m_globalFault ) handleElem(new Element(currentelem));
|
|
||||||
else handleGlobalFaultElem(new Element(currentelem));
|
|
||||||
break;
|
|
||||||
case responseParserHook::EMPTY_ELEMENT:
|
|
||||||
if(m_tagstack.size() == 1 && content == "fault") m_globalFault = true;
|
|
||||||
if( !m_globalFault ) handleElem(new Element(content,m_nextAttributeList,vector<Node*>()));
|
|
||||||
else handleGlobalFaultElem(new Element(content,m_nextAttributeList,vector<Node*>()));
|
|
||||||
m_nextAttributeList.clear();
|
|
||||||
break;
|
|
||||||
case responseParserHook::ATTRIBUTE_VALUE:
|
|
||||||
m_nextAttributeValue = content;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
string msg = Logger::getMessageFormatString(Logger::UnknownCallbackInXMLParser);
|
|
||||||
boost::format fmt(msg);
|
|
||||||
fmt % type % content;
|
|
||||||
Logger::log(Logger::FATAL,fmt.str());
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
@ -1,77 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Christof Donat *
|
|
||||||
* cdonat@gmx.de *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#include "cmdlineparser.h"
|
|
||||||
#include "xmlparser.h"
|
|
||||||
|
|
||||||
#include <boost/shared_ptr.hpp>
|
|
||||||
#include <stack>
|
|
||||||
#include <map>
|
|
||||||
#include <vector>
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
#ifndef HSADMIN_TRANSACTION
|
|
||||||
#define HSADMIN_TRANSACTION
|
|
||||||
|
|
||||||
using boost::shared_ptr;
|
|
||||||
using std::stack;
|
|
||||||
using std::map;
|
|
||||||
using std::vector;
|
|
||||||
using std::string;
|
|
||||||
|
|
||||||
//! encapsulates a transaction.
|
|
||||||
class Transaction:
|
|
||||||
public abstractcommandlineparser::CmdLineParser<commandline::Parameters,commandline::parsedParameters>,
|
|
||||||
public xmlParser::responseParserHook {
|
|
||||||
public:
|
|
||||||
//! parses all the commandline-Parameters
|
|
||||||
Transaction(vector<string> options);
|
|
||||||
|
|
||||||
string& getUser() { return m_parsed->m_user; };
|
|
||||||
//! actually execute the transaction - just needs the config and does everything else for you
|
|
||||||
void operator()(shared_ptr<ConfigFileParser> cfgfile);
|
|
||||||
|
|
||||||
//! callback for XML-Parser
|
|
||||||
virtual bool operator()(int type, string content);
|
|
||||||
|
|
||||||
//! returns the parsed parameters
|
|
||||||
shared_ptr<commandline::parsedParameters> getParsed() { return m_parsed; };
|
|
||||||
|
|
||||||
private:
|
|
||||||
bool m_globalFault;
|
|
||||||
int m_currentCall;
|
|
||||||
stack<xmlParser::Element> m_tagstack;
|
|
||||||
string m_nextAttributeValue;
|
|
||||||
map<string,string> m_nextAttributeList;
|
|
||||||
|
|
||||||
void handleElem(xmlParser::Element * elem);
|
|
||||||
void handleGlobalFaultElem(xmlParser::Element * elem);
|
|
||||||
|
|
||||||
string replaceEntities(const string &input);
|
|
||||||
string getContent(xmlParser::Element* value);
|
|
||||||
xmlParser::Element* stepin(int count,xmlParser::Element* value);
|
|
||||||
|
|
||||||
public:
|
|
||||||
xmlParser::Element *m_docelem;
|
|
||||||
};
|
|
||||||
|
|
||||||
#else
|
|
||||||
class Transaction;
|
|
||||||
#endif /* HSADMIN_TRANSACTION */
|
|
||||||
@ -1,209 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Christof Donat *
|
|
||||||
* cdonat@gmx.de *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#include "xmlparser.h"
|
|
||||||
#include "logger.h"
|
|
||||||
|
|
||||||
namespace xmlParser {
|
|
||||||
|
|
||||||
bool parser::operator()(const string& content, int &pos, responseParserHook *hook) { return false; }
|
|
||||||
|
|
||||||
bool spaceParser::operator()(const string& content, int &pos, responseParserHook *hook) {
|
|
||||||
if( content[pos] == ' ' || content[pos] == '\t' || content[pos] == '\n' || content[pos] == '\r' ) {
|
|
||||||
pos++; return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool commentParser::operator()(const string& content, int &pos, responseParserHook *hook) {
|
|
||||||
int oldpos = pos;
|
|
||||||
if( content.substr(pos,4) == "<!--" ) {
|
|
||||||
pos+= 4;
|
|
||||||
while( content.substr(pos,3) != "-->" && pos < content.length() ) pos++;
|
|
||||||
if(pos < content.length()) {
|
|
||||||
pos += 3; return (*hook)(8,content.substr(oldpos+4,(pos-oldpos)-7));
|
|
||||||
}
|
|
||||||
pos = oldpos;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool nameParser::operator()(const string& content, int &pos, responseParserHook *hook) {
|
|
||||||
int oldpos = pos;
|
|
||||||
if( !( (content[pos] >= '0' && content[pos] <= '9' ) ||
|
|
||||||
(content[pos] >= 'a' && content[pos] <= 'z' ) ||
|
|
||||||
(content[pos] >= 'A' && content[pos] <= 'Z' ) ||
|
|
||||||
content[pos] == '.' ||
|
|
||||||
content[pos] == ':' ||
|
|
||||||
content[pos] == '_' ) )
|
|
||||||
return false;
|
|
||||||
while( (content[pos] >= '0' && content[pos] <= '9' ) ||
|
|
||||||
(content[pos] >= 'a' && content[pos] <= 'z' ) ||
|
|
||||||
(content[pos] >= 'A' && content[pos] <= 'Z' ) ||
|
|
||||||
content[pos] == '.' ||
|
|
||||||
content[pos] == ':' ||
|
|
||||||
content[pos] == '_' ) pos++;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool attributeValueParser::operator()(const string& content, int &pos, responseParserHook *hook) {
|
|
||||||
int oldpos = pos;
|
|
||||||
if( content[pos] == '"' ) {
|
|
||||||
pos++;
|
|
||||||
while( content[pos] != '"' && pos < content.length() ) pos++;
|
|
||||||
if( pos >= content.length() ) { pos = oldpos; return false; }
|
|
||||||
pos++;
|
|
||||||
}
|
|
||||||
else if( content[pos] == '\'' ) {
|
|
||||||
pos++;
|
|
||||||
while( content[pos] != '\'' && pos < content.length() ) pos++;
|
|
||||||
if( pos >= content.length() ) { pos = oldpos; return false; }
|
|
||||||
pos++;
|
|
||||||
} else {
|
|
||||||
pos = oldpos;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return (*hook)(32,content.substr(oldpos+1,(pos-oldpos)-2));
|
|
||||||
}
|
|
||||||
|
|
||||||
bool attributeParser::operator()(const string& content, int &pos, responseParserHook *hook) {
|
|
||||||
int oldpos = pos;
|
|
||||||
if( ! space(content,pos,hook) ) return false;
|
|
||||||
while(space(content,pos,hook) && pos < content.length() );
|
|
||||||
int namestartpos = pos;
|
|
||||||
if( ! name(content,pos,hook) ) { pos = oldpos; return false; }
|
|
||||||
int nameendpos = pos;
|
|
||||||
if( content[pos] != '=' ) { pos = oldpos; return false; }
|
|
||||||
pos++;
|
|
||||||
if( ! value(content,pos,hook) ) { pos = oldpos; return false; }
|
|
||||||
return (*hook)(2,content.substr(oldpos+1,(nameendpos-oldpos)-1));
|
|
||||||
};
|
|
||||||
|
|
||||||
bool emptyelemParser::operator()(const string& content, int &pos, responseParserHook *hook) {
|
|
||||||
int oldpos = pos;
|
|
||||||
if( content[pos] != '<' ) return false;
|
|
||||||
pos++;
|
|
||||||
if( !name(content,pos,hook) ) { pos = oldpos; return false; }
|
|
||||||
int nameendpos = pos;
|
|
||||||
|
|
||||||
while(attrib(content,pos,hook) && pos < content.length() );
|
|
||||||
while(space(content,pos,hook) && pos < content.length() );
|
|
||||||
if( content.substr(pos,2) != "/>" ) { pos = oldpos; return false; }
|
|
||||||
pos += 2;
|
|
||||||
return (*hook)(18,content.substr(oldpos+1,(nameendpos-oldpos)-1));
|
|
||||||
}
|
|
||||||
|
|
||||||
bool startelemParser::operator()(const string& content, int &pos, responseParserHook *hook) {
|
|
||||||
int oldpos = pos;
|
|
||||||
if( content[pos] != '<' ) return false;
|
|
||||||
pos++;
|
|
||||||
if( !name(content,pos,hook) ) { pos = oldpos; return false; }
|
|
||||||
int nameendpos = pos;
|
|
||||||
|
|
||||||
while(attrib(content,pos,hook) && pos < content.length() );
|
|
||||||
while(space(content,pos,hook) && pos < content.length() );
|
|
||||||
if( content[pos] != '>' ) { pos = oldpos; return false; }
|
|
||||||
pos ++;
|
|
||||||
|
|
||||||
return (*hook)(16,content.substr(oldpos+1,(nameendpos-oldpos)-1));
|
|
||||||
}
|
|
||||||
|
|
||||||
bool endelemParser::operator()(const string& content, int &pos, responseParserHook *hook) {
|
|
||||||
int oldpos = pos;
|
|
||||||
if( content.substr(pos,2) != "</" ) return false;
|
|
||||||
pos += 2;
|
|
||||||
if( !name(content,pos,hook) ) { pos = oldpos; return false; }
|
|
||||||
int nameendpos = pos;
|
|
||||||
|
|
||||||
while(space(content,pos,hook) && pos < content.length() );
|
|
||||||
if( content[pos] != '>' ) { pos = oldpos; return false; }
|
|
||||||
pos ++;
|
|
||||||
|
|
||||||
return (*hook)(17,content.substr(oldpos+2,(nameendpos-oldpos)-2));
|
|
||||||
}
|
|
||||||
|
|
||||||
bool textParser::operator()(const string& content, int &pos, responseParserHook *hook) {
|
|
||||||
int oldpos = pos;
|
|
||||||
if( content[pos] == '<' )
|
|
||||||
return false;
|
|
||||||
while( content[pos] != '<' && pos < content.length() ) pos++;
|
|
||||||
return (*hook)(3,content.substr(oldpos,pos-oldpos));
|
|
||||||
};
|
|
||||||
|
|
||||||
bool cdataParser::operator()(const string& content, int &pos, responseParserHook *hook) {
|
|
||||||
int oldpos = pos;
|
|
||||||
if( content.substr(pos,9) != "<![CDATA[" ) return false;
|
|
||||||
bool foundend = false;
|
|
||||||
while( !( foundend = (content.substr(pos,3) == "]]>") ) && pos < content.length() ) pos++;
|
|
||||||
if( !foundend ) { pos = oldpos; return false; }
|
|
||||||
pos += 3;
|
|
||||||
return (*hook)(4,content.substr(oldpos+9,(pos-oldpos)-12));
|
|
||||||
};
|
|
||||||
|
|
||||||
bool elemParser::operator()(const string& content, int &pos, responseParserHook *hook) {
|
|
||||||
int oldpos = pos;
|
|
||||||
if( emptyelem(content,pos,hook) ) return (*hook)(1,content.substr(oldpos,pos-oldpos));
|
|
||||||
if( ! elemstart(content,pos,hook) ) return false;
|
|
||||||
|
|
||||||
bool foundend = false;
|
|
||||||
while( !(foundend = endelem(content,pos,hook)) && pos < content.length() ) {
|
|
||||||
if( ! ( comspace(content,pos,hook) ||
|
|
||||||
text(content,pos,hook) ||
|
|
||||||
(*this)(content,pos,hook) ||
|
|
||||||
cdata(content,pos,hook) ) ) {
|
|
||||||
pos = oldpos;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if( foundend ) return (*hook)(1,content.substr(oldpos,pos-oldpos));
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool xmlpcParser::operator()(const string& content, int &pos, responseParserHook *hook) {
|
|
||||||
int oldpos = pos;
|
|
||||||
if( content.substr(pos,5) != "<?xml" ) return false;
|
|
||||||
pos += 5;
|
|
||||||
|
|
||||||
while(attrib(content,pos,hook) && pos < content.length() );
|
|
||||||
while(space(content,pos,hook) && pos < content.length() );
|
|
||||||
if( content.substr(pos,2) != "?>" ) { pos = oldpos; return false; }
|
|
||||||
pos += 2;
|
|
||||||
return (*hook)(7,string("xml"));
|
|
||||||
}
|
|
||||||
|
|
||||||
bool XMLParser::operator()(const string& content, int &pos, responseParserHook *hook) {
|
|
||||||
int oldpos = pos;
|
|
||||||
while(space(content,pos,hook) && pos < content.length() );
|
|
||||||
if( ! xmlpc(content,pos,hook) ) { pos = oldpos; return false; }
|
|
||||||
while(comspace(content,pos,hook) && pos < content.length() );
|
|
||||||
if( ! elem(content,pos,hook) ) { pos = oldpos; return false; }
|
|
||||||
while(comspace(content,pos,hook) && pos < content.length() );
|
|
||||||
return (*hook)(9,content.substr(oldpos,pos-oldpos));
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ResponseParser::operator()(const string& content, responseParserHook *hook) {
|
|
||||||
int pos = 0;
|
|
||||||
bool rval = xml(content,pos,hook);
|
|
||||||
if( pos < content.length() ) return false;
|
|
||||||
return rval;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,296 +0,0 @@
|
|||||||
/***************************************************************************
|
|
||||||
* Copyright (C) 2005 by Christof Donat *
|
|
||||||
* cdonat@gmx.de *
|
|
||||||
* *
|
|
||||||
* 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. *
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
#include <map>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
#ifndef HSADMIN_XMLPARSER
|
|
||||||
#define HSADMIN_XMLPARSER
|
|
||||||
|
|
||||||
/** \brief a general XML Parser
|
|
||||||
*
|
|
||||||
* well, it works for me. The API is inspired a bit by SAX, but I didn't
|
|
||||||
* whant to create the full SAX API.
|
|
||||||
*/
|
|
||||||
namespace xmlParser {
|
|
||||||
|
|
||||||
using std::string;
|
|
||||||
using std::map;
|
|
||||||
using std::vector;
|
|
||||||
|
|
||||||
//! Node Types
|
|
||||||
typedef enum {
|
|
||||||
UNKNOWN = 0,
|
|
||||||
ELEMENT = 1,
|
|
||||||
ATTRIBUTE = 2,
|
|
||||||
TEXT = 3,
|
|
||||||
CDATA = 4,
|
|
||||||
PROCESSING_INSTRUCTION = 7,
|
|
||||||
COMMENT = 8,
|
|
||||||
DOCUMENT = 9,
|
|
||||||
|
|
||||||
} nodeType;
|
|
||||||
|
|
||||||
//! base class for all Nodes
|
|
||||||
class Node {
|
|
||||||
public:
|
|
||||||
Node(nodeType type): m_type(type) {};
|
|
||||||
Node(): m_type(UNKNOWN) {};
|
|
||||||
nodeType m_type;
|
|
||||||
};
|
|
||||||
|
|
||||||
//! Text node
|
|
||||||
class Text: public Node {
|
|
||||||
public:
|
|
||||||
Text(): m_content(""), Node::Node(TEXT) {};
|
|
||||||
//! create a Text node from a C++ String
|
|
||||||
Text(string content): m_content(content), Node::Node(TEXT) {};
|
|
||||||
//! copy-construct a Text node
|
|
||||||
Text(const Text &text): m_content(text.m_content), Node::Node(TEXT) {};
|
|
||||||
|
|
||||||
//! the actual text
|
|
||||||
string m_content;
|
|
||||||
};
|
|
||||||
|
|
||||||
//! Element node
|
|
||||||
class Element: public Node {
|
|
||||||
public:
|
|
||||||
Element():
|
|
||||||
m_nodes(vector<Node*>(0)),
|
|
||||||
m_attributes(map<string,string>()),
|
|
||||||
m_name(""),
|
|
||||||
Node::Node(ELEMENT) {};
|
|
||||||
//! create a Element from its tag-name , a List of Attributes and a List of Child-Nodes
|
|
||||||
Element(string name, map<string,string> attributes, vector<Node*> content):
|
|
||||||
m_nodes(content),
|
|
||||||
m_attributes(attributes),
|
|
||||||
m_name(name),
|
|
||||||
Node::Node(ELEMENT) {};
|
|
||||||
//! copy-construct a Element Node
|
|
||||||
Element(const Element &elm):
|
|
||||||
m_nodes(elm.m_nodes),
|
|
||||||
m_attributes(elm.m_attributes),
|
|
||||||
m_name(elm.m_name),
|
|
||||||
Node::Node(ELEMENT) {};
|
|
||||||
|
|
||||||
//! The tag name
|
|
||||||
string m_name;
|
|
||||||
//! the attributes
|
|
||||||
map<string,string> m_attributes;
|
|
||||||
//! che child nodes
|
|
||||||
vector<Node*> m_nodes;
|
|
||||||
};
|
|
||||||
|
|
||||||
//! the XML parser calls the operator() for everything it finds
|
|
||||||
class responseParserHook {
|
|
||||||
public:
|
|
||||||
enum {
|
|
||||||
ELEMENT = 1,
|
|
||||||
ATTRIBUTE = 2,
|
|
||||||
TEXT = 3,
|
|
||||||
CDATA = 4,
|
|
||||||
PROCESSING_INSTRUCTION = 7,
|
|
||||||
COMMENT = 8,
|
|
||||||
DOCUMENT = 9,
|
|
||||||
START_ELEMENT = 16,
|
|
||||||
END_ELEMENT = 17,
|
|
||||||
EMPTY_ELEMENT = 18,
|
|
||||||
ATTRIBUTE_VALUE = 32,
|
|
||||||
};
|
|
||||||
|
|
||||||
virtual bool operator()(int type, string content) = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
//! a dummy Parser; the general parser base class
|
|
||||||
class parser {
|
|
||||||
public:
|
|
||||||
bool operator()(const string& content, int &pos, responseParserHook *hook);
|
|
||||||
};
|
|
||||||
|
|
||||||
/** \brief Template to construct a Parser from two parsers.
|
|
||||||
*
|
|
||||||
* combines the results of the two parsers with 'or'.
|
|
||||||
*/
|
|
||||||
template <class first, class second> class orRule : public parser {
|
|
||||||
public:
|
|
||||||
inline bool operator()(const string& content, int &pos, responseParserHook *hook) {
|
|
||||||
int oldpos = pos;
|
|
||||||
if( !car(content,pos,hook) ) return cdr(content,pos,hook);
|
|
||||||
return true;
|
|
||||||
};
|
|
||||||
private:
|
|
||||||
first car;
|
|
||||||
second cdr;
|
|
||||||
};
|
|
||||||
|
|
||||||
//! parse everything that is a space
|
|
||||||
class spaceParser: public parser {
|
|
||||||
public:
|
|
||||||
bool operator()(const string& content, int &pos, responseParserHook *hook);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! parse XML comments
|
|
||||||
class commentParser {
|
|
||||||
public:
|
|
||||||
bool operator()(const string& content, int &pos, responseParserHook *hook);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! parse either spaces or comments
|
|
||||||
typedef orRule<spaceParser, commentParser> comspaceParser;
|
|
||||||
|
|
||||||
//! parse XML names
|
|
||||||
class nameParser: public parser {
|
|
||||||
public:
|
|
||||||
bool operator()(const string& content, int &pos, responseParserHook *hook);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! parse XML attribute values
|
|
||||||
class attributeValueParser: public parser {
|
|
||||||
public:
|
|
||||||
bool operator()(const string& content, int &pos, responseParserHook *hook);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! parse XML attributes with name and value
|
|
||||||
class attributeParser: public parser {
|
|
||||||
public:
|
|
||||||
bool operator()(const string& content, int &pos, responseParserHook *hook);
|
|
||||||
|
|
||||||
private:
|
|
||||||
nameParser name;
|
|
||||||
spaceParser space;
|
|
||||||
attributeValueParser value;
|
|
||||||
};
|
|
||||||
|
|
||||||
//! parse an empty element
|
|
||||||
class emptyelemParser: public parser {
|
|
||||||
public:
|
|
||||||
bool operator()(const string& content, int &pos, responseParserHook *hook);
|
|
||||||
|
|
||||||
private:
|
|
||||||
nameParser name;
|
|
||||||
attributeParser attrib;
|
|
||||||
spaceParser space;
|
|
||||||
};
|
|
||||||
|
|
||||||
//! parse the start of an element
|
|
||||||
class startelemParser: public parser {
|
|
||||||
public:
|
|
||||||
bool operator()(const string& content, int &pos, responseParserHook *hook);
|
|
||||||
|
|
||||||
private:
|
|
||||||
nameParser name;
|
|
||||||
attributeParser attrib;
|
|
||||||
spaceParser space;
|
|
||||||
};
|
|
||||||
|
|
||||||
//! parse the end of an element
|
|
||||||
class endelemParser: public parser {
|
|
||||||
public:
|
|
||||||
bool operator()(const string& content, int &pos, responseParserHook *hook);
|
|
||||||
|
|
||||||
private:
|
|
||||||
nameParser name;
|
|
||||||
spaceParser space;
|
|
||||||
};
|
|
||||||
|
|
||||||
//! parse Text
|
|
||||||
class textParser: public parser {
|
|
||||||
public:
|
|
||||||
bool operator()(const string& content, int &pos, responseParserHook *hook);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! parse CDATA-sections
|
|
||||||
class cdataParser: public parser {
|
|
||||||
public:
|
|
||||||
bool operator()(const string& content, int &pos, responseParserHook *hook);
|
|
||||||
};
|
|
||||||
|
|
||||||
//! parse general Elements
|
|
||||||
class elemParser: public parser {
|
|
||||||
public:
|
|
||||||
bool operator()(const string& content, int &pos, responseParserHook *hook);
|
|
||||||
|
|
||||||
private:
|
|
||||||
emptyelemParser emptyelem;
|
|
||||||
startelemParser elemstart;
|
|
||||||
comspaceParser comspace;
|
|
||||||
endelemParser endelem;
|
|
||||||
textParser text;
|
|
||||||
cdataParser cdata;
|
|
||||||
};
|
|
||||||
|
|
||||||
//! parse the xml Processing instruction at the beginning of each XML-File
|
|
||||||
class xmlpcParser: public parser {
|
|
||||||
public:
|
|
||||||
bool operator()(const string& content, int &pos, responseParserHook *hook);
|
|
||||||
|
|
||||||
private:
|
|
||||||
nameParser name;
|
|
||||||
attributeParser attrib;
|
|
||||||
spaceParser space;
|
|
||||||
};
|
|
||||||
|
|
||||||
//! parse an XML-File
|
|
||||||
class XMLParser: public parser {
|
|
||||||
public:
|
|
||||||
bool operator()(const string& content, int &pos, responseParserHook *hook);
|
|
||||||
private:
|
|
||||||
spaceParser space;
|
|
||||||
xmlpcParser xmlpc;
|
|
||||||
comspaceParser comspace;
|
|
||||||
elemParser elem;
|
|
||||||
};
|
|
||||||
|
|
||||||
//! just a convenient wraper around the XMLParser
|
|
||||||
class ResponseParser {
|
|
||||||
public:
|
|
||||||
bool operator()(const string& content, responseParserHook *hook);
|
|
||||||
private:
|
|
||||||
XMLParser xml;
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#else /* HSADMIN_XMLPARSER */
|
|
||||||
|
|
||||||
namespace xmlParser {
|
|
||||||
|
|
||||||
class responseParserHook;
|
|
||||||
class parser;
|
|
||||||
template <class first, class second> class orRule;
|
|
||||||
class spaceParser;
|
|
||||||
class commentParser;
|
|
||||||
class nameParser;
|
|
||||||
class attributeValueParser;
|
|
||||||
class attributeParser;
|
|
||||||
class emptyelemParser;
|
|
||||||
class startelemParser;
|
|
||||||
class endelemParser;
|
|
||||||
class textParser;
|
|
||||||
class cdataParser;
|
|
||||||
class elemParser;
|
|
||||||
class xmlpcParser;
|
|
||||||
class XMLParser;
|
|
||||||
class ResponseParser;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* HSADMIN_XMLPARSER */
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<classpath>
|
|
||||||
<classpathentry kind="src" path="src"/>
|
|
||||||
<classpathentry kind="src" path="test"/>
|
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
|
|
||||||
<classpathentry kind="lib" path="lib/activemq-core-5.4.2.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/commons-beanutils-1.8.3.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/commons-collections-3.2.1.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/commons-dbcp-1.4.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/commons-lang-2.4.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/commons-net2-2.0.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/commons-pool-1.5.4.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/geronimo-j2ee-management_1.1_spec-1.0.1.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/geronimo-jpa_2.0_spec-1.1.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/geronimo-jta_1.1_spec-1.1.1.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/geronimo-validation_1.0_spec-1.1.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/jpwgen-1.2.0.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/mail.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/openjpa-2.1.1.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/org.apache.bval.bundle-0.2-incubating.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/serp-1.13.1.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/servlet-api-2.4.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/ws-commons-util-1.0.2.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/xmlrpc-client-3.1.3.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/xmlrpc-common-3.1.3.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/xmlrpc-server-3.1.3.jar"/>
|
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
|
|
||||||
<classpathentry kind="lib" path="lib/velocity-1.7.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/commons-logging-api-1.1.1.jar"/>
|
|
||||||
<classpathentry kind="output" path="bin"/>
|
|
||||||
</classpath>
|
|
||||||
5
hsarback/.gitignore
vendored
5
hsarback/.gitignore
vendored
@ -1,3 +1,6 @@
|
|||||||
/build
|
/build
|
||||||
/bin
|
/bin
|
||||||
/.settings
|
/.classpath
|
||||||
|
/.project
|
||||||
|
/.settings/
|
||||||
|
/target/
|
||||||
|
|||||||
@ -1,17 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<projectDescription>
|
|
||||||
<name>hsarback</name>
|
|
||||||
<comment></comment>
|
|
||||||
<projects>
|
|
||||||
</projects>
|
|
||||||
<buildSpec>
|
|
||||||
<buildCommand>
|
|
||||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
|
||||||
<arguments>
|
|
||||||
</arguments>
|
|
||||||
</buildCommand>
|
|
||||||
</buildSpec>
|
|
||||||
<natures>
|
|
||||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
|
||||||
</natures>
|
|
||||||
</projectDescription>
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
eclipse.preferences.version=1
|
|
||||||
encoding//doc/overview-for-translatewiki-net=UTF-8
|
|
||||||
@ -1,178 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project name="hsarback" default="war">
|
|
||||||
|
|
||||||
<property name="build.home" value="${basedir}/build" />
|
|
||||||
<property name="lib.home" value="${basedir}/lib" />
|
|
||||||
<property name="conf.home" value="${basedir}/conf" />
|
|
||||||
<property name="src.home" value="${basedir}/src" />
|
|
||||||
<property name="test.home" value="${basedir}/test" />
|
|
||||||
<property name="dist.home" value="${basedir}/dist" />
|
|
||||||
|
|
||||||
<property file="${user.home}/.hsar.ant.properties" />
|
|
||||||
|
|
||||||
<!-- Optionen für Java-Compiler-->
|
|
||||||
<property name="compile.debug" value="true" />
|
|
||||||
<property name="compile.deprecation" value="true" />
|
|
||||||
<property name="compile.optimize" value="true" />
|
|
||||||
|
|
||||||
<path id="compile.classpath">
|
|
||||||
<fileset dir="lib">
|
|
||||||
<include name="*.jar" />
|
|
||||||
</fileset>
|
|
||||||
</path>
|
|
||||||
|
|
||||||
<path id="enhance.classpath">
|
|
||||||
<fileset dir="lib">
|
|
||||||
<include name="*.jar" />
|
|
||||||
</fileset>
|
|
||||||
<dirset dir="conf"/>
|
|
||||||
<dirset dir="${build.home}"/>
|
|
||||||
</path>
|
|
||||||
|
|
||||||
<target name="clean" description="aufräumen">
|
|
||||||
<delete dir="${build.home}" />
|
|
||||||
<delete dir="${dist.home}" />
|
|
||||||
<delete file="webapp/WEB-INF/web.xml" />
|
|
||||||
<delete file="webapp/META-INF/context.xml" />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="deploy" depends="war">
|
|
||||||
<delete dir="${hsar.deploy.dir}/hsar" />
|
|
||||||
<copy file="build/hsar.war" todir="${hsar.deploy.dir}" />
|
|
||||||
<!-- <sleep minutes="2"/> -->
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="jar" depends="enhance">
|
|
||||||
<jar destfile="build/hsar.jar">
|
|
||||||
<fileset dir="build/cls"/>
|
|
||||||
<fileset dir="src">
|
|
||||||
<include name="**/*.properties"/>
|
|
||||||
<include name="**/*.vm"/>
|
|
||||||
</fileset>
|
|
||||||
<fileset dir="conf">
|
|
||||||
<include name="**/*.xml"/>
|
|
||||||
</fileset>
|
|
||||||
</jar>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="war" depends="enhance">
|
|
||||||
<copy file="conf/WEB-INF/${target}-web.xml" tofile="webapp/WEB-INF/web.xml">
|
|
||||||
<filterset>
|
|
||||||
<filter token="LOGIN_HOST" value="${cas.domain.name}"/>
|
|
||||||
<filter token="LOGIN_PORT" value="${cas.https.port}"/>
|
|
||||||
<filter token="CONFIG_HOST" value="${hsar.domain.name}"/>
|
|
||||||
<filter token="CONFIG_PORT" value="${hsar.https.port}"/>
|
|
||||||
</filterset>
|
|
||||||
</copy>
|
|
||||||
<copy file="conf/META-INF/${target}-context.xml" tofile="webapp/META-INF/context.xml">
|
|
||||||
</copy>
|
|
||||||
<war destfile="build/hsar.war" basedir="webapp" needxmlfile="false">
|
|
||||||
<lib dir="lib">
|
|
||||||
<include name="**/*.jar"/>
|
|
||||||
<exclude name="**/servlet*.jar"/>
|
|
||||||
<exclude name="**/geronimo-jms*.jar"/>
|
|
||||||
<exclude name="**/geronimo-j2ee-management*.jar"/>
|
|
||||||
<exclude name="**/activemq*.jar"/>
|
|
||||||
</lib>
|
|
||||||
<classes dir="build/cls" />
|
|
||||||
<classes dir="src">
|
|
||||||
<include name="**/*.properties"/>
|
|
||||||
<include name="**/*.vm"/>
|
|
||||||
</classes>
|
|
||||||
<classes dir="conf">
|
|
||||||
<include name="**/*.xml"/>
|
|
||||||
</classes>
|
|
||||||
</war>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="compile" description="compilieren">
|
|
||||||
<mkdir dir="${build.home}" />
|
|
||||||
<mkdir dir="${build.home}/cls" />
|
|
||||||
<javac srcdir="${src.home}" destdir="${build.home}/cls"
|
|
||||||
source="1.6" target="1.6"
|
|
||||||
debug="${compile.debug}" deprecation="${compile.deprecation}"
|
|
||||||
optimize="${compile.optimize}" encoding="UTF8" includeantruntime="false">
|
|
||||||
<classpath refid="compile.classpath" />
|
|
||||||
</javac>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="compile-test" description="tests compilieren" depends="compile">
|
|
||||||
<mkdir dir="${build.home}" />
|
|
||||||
<mkdir dir="${build.home}/test" />
|
|
||||||
<javac
|
|
||||||
srcdir="${test.home}" destdir="${build.home}/test"
|
|
||||||
source="1.6" target="1.6"
|
|
||||||
debug="${compile.debug}" deprecation="${compile.deprecation}"
|
|
||||||
optimize="${compile.optimize}" encoding="UTF8" includeantruntime="false">
|
|
||||||
<classpath refid="compile.classpath" />
|
|
||||||
<classpath>
|
|
||||||
<pathelement path="${compile.classpath}"/>
|
|
||||||
<pathelement location="${build.home}/cls"/>
|
|
||||||
<pathelement path="/usr/share/java/junit4.jar"/>
|
|
||||||
</classpath>
|
|
||||||
</javac>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="enhance" description="openjpa enhancer" depends="compile">
|
|
||||||
<taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask">
|
|
||||||
<classpath refid="enhance.classpath"/>
|
|
||||||
</taskdef>
|
|
||||||
<taskdef name="mappingtool" classname="org.apache.openjpa.jdbc.ant.MappingToolTask">
|
|
||||||
<classpath refid="enhance.classpath"/>
|
|
||||||
</taskdef>
|
|
||||||
<openjpac>
|
|
||||||
<classpath refid="enhance.classpath"/>
|
|
||||||
</openjpac>
|
|
||||||
<echo message="Enhancing complete."/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="init-db" description="init empty database">
|
|
||||||
<sql
|
|
||||||
classpath="/usr/share/java/postgresql-jdbc3.jar"
|
|
||||||
driver="org.postgresql.Driver"
|
|
||||||
url="jdbc:postgresql://${database.host}:5432/${database.name}"
|
|
||||||
userid="${database.user}" password="${database.password}"
|
|
||||||
src="database/schema.sql" />
|
|
||||||
<sql
|
|
||||||
classpath="/usr/share/java/postgresql-jdbc3.jar"
|
|
||||||
driver="org.postgresql.Driver"
|
|
||||||
url="jdbc:postgresql://${database.host}:5432/${database.name}"
|
|
||||||
userid="${database.user}" password="${database.password}"
|
|
||||||
src="database/data.sql" />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="drop-db" description="make empty database">
|
|
||||||
<sql
|
|
||||||
classpath="/usr/share/java/postgresql-jdbc3.jar"
|
|
||||||
driver="org.postgresql.Driver"
|
|
||||||
url="jdbc:postgresql://${database.host}:5432/${database.name}"
|
|
||||||
userid="${database.user}" password="${database.password}"
|
|
||||||
src="database/dropschema.sql" />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="update-db" description="upgrade existing database">
|
|
||||||
<sql
|
|
||||||
classpath="/usr/share/java/postgresql-jdbc3.jar"
|
|
||||||
driver="org.postgresql.Driver"
|
|
||||||
url="jdbc:postgresql://${database.host}:5432/${database.name}"
|
|
||||||
userid="${database.user}" password="${database.password}"
|
|
||||||
src="database/database_update.sql" />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="remote-test" description="inspection of xmlrpc-api" depends="compile-test">
|
|
||||||
<mkdir dir="${build.home}/junit" />
|
|
||||||
<junit printsummary="yes" fork="yes">
|
|
||||||
<classpath>
|
|
||||||
<fileset dir="lib">
|
|
||||||
<include name="*.jar" />
|
|
||||||
</fileset>
|
|
||||||
<pathelement location="${build.home}/cls"/>
|
|
||||||
<pathelement location="${build.home}/test"/>
|
|
||||||
<pathelement path="/usr/share/java/junit4.jar"/>
|
|
||||||
</classpath>
|
|
||||||
<formatter type="xml"/>
|
|
||||||
<test name="de.hsadmin.remote.ContinuousIntegrationTest" todir="${build.home}/junit" />
|
|
||||||
</junit>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
|
|
||||||
<persistence-unit name="hsadmin" transaction-type="RESOURCE_LOCAL">
|
|
||||||
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
|
|
||||||
<non-jta-data-source>java:/comp/env/jdbc/HSAdminDB</non-jta-data-source>
|
|
||||||
<class>de.hsadmin.core.qserv.QueueTask</class>
|
|
||||||
<class>de.hsadmin.mods.cust.Customer</class>
|
|
||||||
<class>de.hsadmin.mods.cust.Contact</class>
|
|
||||||
<class>de.hsadmin.mods.pac.Pac</class>
|
|
||||||
<class>de.hsadmin.mods.pac.BasePac</class>
|
|
||||||
<class>de.hsadmin.mods.pac.BaseComponent</class>
|
|
||||||
<class>de.hsadmin.mods.pac.Component</class>
|
|
||||||
<class>de.hsadmin.mods.pac.PacComponent</class>
|
|
||||||
<class>de.hsadmin.mods.pac.Hive</class>
|
|
||||||
<class>de.hsadmin.mods.pac.INetAddress</class>
|
|
||||||
<class>de.hsadmin.mods.user.UnixUser</class>
|
|
||||||
<class>de.hsadmin.mods.dom.Domain</class>
|
|
||||||
<class>de.hsadmin.mods.dom.DomainOption</class>
|
|
||||||
<class>de.hsadmin.mods.email.EMailAddress</class>
|
|
||||||
<class>de.hsadmin.mods.email.EMailAlias</class>
|
|
||||||
<class>de.hsadmin.mods.db.DatabaseUser</class>
|
|
||||||
<class>de.hsadmin.mods.db.MySqlUser</class>
|
|
||||||
<class>de.hsadmin.mods.db.PgSqlUser</class>
|
|
||||||
<class>de.hsadmin.mods.db.Database</class>
|
|
||||||
<class>de.hsadmin.mods.db.MySqlDatabase</class>
|
|
||||||
<class>de.hsadmin.mods.db.PgSqlDatabase</class>
|
|
||||||
<properties>
|
|
||||||
<property name="openjpa.ConnectionDriverName" value="org.postgresql.Driver"/>
|
|
||||||
<property name="openjpa.Compatibility" value="QuotedNumbersInQueries=true"/>
|
|
||||||
</properties>
|
|
||||||
</persistence-unit>
|
|
||||||
</persistence>
|
|
||||||
@ -37,11 +37,21 @@
|
|||||||
</init-param>
|
</init-param>
|
||||||
</servlet>
|
</servlet>
|
||||||
|
|
||||||
|
<servlet>
|
||||||
|
<servlet-name>PillarServlet</servlet-name>
|
||||||
|
<servlet-class>de.hsadmin.pillar.JsonPillarServlet</servlet-class>
|
||||||
|
</servlet>
|
||||||
|
|
||||||
<servlet-mapping>
|
<servlet-mapping>
|
||||||
<servlet-name>Queue Status Servlet</servlet-name>
|
<servlet-name>Queue Status Servlet</servlet-name>
|
||||||
<url-pattern>/queueStatus</url-pattern>
|
<url-pattern>/queueStatus</url-pattern>
|
||||||
</servlet-mapping>
|
</servlet-mapping>
|
||||||
|
|
||||||
|
<servlet-mapping>
|
||||||
|
<servlet-name>PillarServlet</servlet-name>
|
||||||
|
<url-pattern>/pillar</url-pattern>
|
||||||
|
</servlet-mapping>
|
||||||
|
|
||||||
<servlet-mapping>
|
<servlet-mapping>
|
||||||
<servlet-name>Queue PacTasks Servlet</servlet-name>
|
<servlet-name>Queue PacTasks Servlet</servlet-name>
|
||||||
<url-pattern>/queuePacTasks</url-pattern>
|
<url-pattern>/queuePacTasks</url-pattern>
|
||||||
|
|||||||
@ -39,11 +39,21 @@
|
|||||||
</init-param>
|
</init-param>
|
||||||
</servlet>
|
</servlet>
|
||||||
|
|
||||||
|
<servlet>
|
||||||
|
<servlet-name>PillarServlet</servlet-name>
|
||||||
|
<servlet-class>de.hsadmin.pillar.JsonPillarServlet</servlet-class>
|
||||||
|
</servlet>
|
||||||
|
|
||||||
<servlet-mapping>
|
<servlet-mapping>
|
||||||
<servlet-name>Queue Status Servlet</servlet-name>
|
<servlet-name>Queue Status Servlet</servlet-name>
|
||||||
<url-pattern>/queueStatus</url-pattern>
|
<url-pattern>/queueStatus</url-pattern>
|
||||||
</servlet-mapping>
|
</servlet-mapping>
|
||||||
|
|
||||||
|
<servlet-mapping>
|
||||||
|
<servlet-name>PillarServlet</servlet-name>
|
||||||
|
<url-pattern>/pillar</url-pattern>
|
||||||
|
</servlet-mapping>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
<servlet-mapping>
|
<servlet-mapping>
|
||||||
<servlet-name>Queue PacTasks Servlet</servlet-name>
|
<servlet-name>Queue PacTasks Servlet</servlet-name>
|
||||||
@ -117,6 +127,12 @@
|
|||||||
<res-auth>Container</res-auth>
|
<res-auth>Container</res-auth>
|
||||||
<res-sharing-scope>Shareable</res-sharing-scope>
|
<res-sharing-scope>Shareable</res-sharing-scope>
|
||||||
</resource-ref>
|
</resource-ref>
|
||||||
|
<resource-ref>
|
||||||
|
<res-ref-name>jms/hsadminSystem-h09</res-ref-name>
|
||||||
|
<res-type>javax.jms.Queue</res-type>
|
||||||
|
<res-auth>Container</res-auth>
|
||||||
|
<res-sharing-scope>Shareable</res-sharing-scope>
|
||||||
|
</resource-ref>
|
||||||
<resource-ref>
|
<resource-ref>
|
||||||
<res-ref-name>jms/hsadminSystem-h10</res-ref-name>
|
<res-ref-name>jms/hsadminSystem-h10</res-ref-name>
|
||||||
<res-type>javax.jms.Queue</res-type>
|
<res-type>javax.jms.Queue</res-type>
|
||||||
@ -651,6 +667,72 @@
|
|||||||
<res-auth>Container</res-auth>
|
<res-auth>Container</res-auth>
|
||||||
<res-sharing-scope>Shareable</res-sharing-scope>
|
<res-sharing-scope>Shareable</res-sharing-scope>
|
||||||
</resource-ref>
|
</resource-ref>
|
||||||
|
<resource-ref>
|
||||||
|
<res-ref-name>jms/hsadminSystem-h99</res-ref-name>
|
||||||
|
<res-type>javax.jms.Queue</res-type>
|
||||||
|
<res-auth>Container</res-auth>
|
||||||
|
<res-sharing-scope>Shareable</res-sharing-scope>
|
||||||
|
</resource-ref>
|
||||||
|
<resource-ref>
|
||||||
|
<res-ref-name>jms/hsadminSystem-vm1101</res-ref-name>
|
||||||
|
<res-type>javax.jms.Queue</res-type>
|
||||||
|
<res-auth>Container</res-auth>
|
||||||
|
<res-sharing-scope>Shareable</res-sharing-scope>
|
||||||
|
</resource-ref>
|
||||||
|
<resource-ref>
|
||||||
|
<res-ref-name>jms/hsadminSystem-vm1102</res-ref-name>
|
||||||
|
<res-type>javax.jms.Queue</res-type>
|
||||||
|
<res-auth>Container</res-auth>
|
||||||
|
<res-sharing-scope>Shareable</res-sharing-scope>
|
||||||
|
</resource-ref>
|
||||||
|
<resource-ref>
|
||||||
|
<res-ref-name>jms/hsadminSystem-vm1103</res-ref-name>
|
||||||
|
<res-type>javax.jms.Queue</res-type>
|
||||||
|
<res-auth>Container</res-auth>
|
||||||
|
<res-sharing-scope>Shareable</res-sharing-scope>
|
||||||
|
</resource-ref>
|
||||||
|
<resource-ref>
|
||||||
|
<res-ref-name>jms/hsadminSystem-vm1104</res-ref-name>
|
||||||
|
<res-type>javax.jms.Queue</res-type>
|
||||||
|
<res-auth>Container</res-auth>
|
||||||
|
<res-sharing-scope>Shareable</res-sharing-scope>
|
||||||
|
</resource-ref>
|
||||||
|
<resource-ref>
|
||||||
|
<res-ref-name>jms/hsadminSystem-vm1105</res-ref-name>
|
||||||
|
<res-type>javax.jms.Queue</res-type>
|
||||||
|
<res-auth>Container</res-auth>
|
||||||
|
<res-sharing-scope>Shareable</res-sharing-scope>
|
||||||
|
</resource-ref>
|
||||||
|
<resource-ref>
|
||||||
|
<res-ref-name>jms/hsadminSystem-vm1106</res-ref-name>
|
||||||
|
<res-type>javax.jms.Queue</res-type>
|
||||||
|
<res-auth>Container</res-auth>
|
||||||
|
<res-sharing-scope>Shareable</res-sharing-scope>
|
||||||
|
</resource-ref>
|
||||||
|
<resource-ref>
|
||||||
|
<res-ref-name>jms/hsadminSystem-vm1107</res-ref-name>
|
||||||
|
<res-type>javax.jms.Queue</res-type>
|
||||||
|
<res-auth>Container</res-auth>
|
||||||
|
<res-sharing-scope>Shareable</res-sharing-scope>
|
||||||
|
</resource-ref>
|
||||||
|
<resource-ref>
|
||||||
|
<res-ref-name>jms/hsadminSystem-vm1108</res-ref-name>
|
||||||
|
<res-type>javax.jms.Queue</res-type>
|
||||||
|
<res-auth>Container</res-auth>
|
||||||
|
<res-sharing-scope>Shareable</res-sharing-scope>
|
||||||
|
</resource-ref>
|
||||||
|
<resource-ref>
|
||||||
|
<res-ref-name>jms/hsadminSystem-vm1109</res-ref-name>
|
||||||
|
<res-type>javax.jms.Queue</res-type>
|
||||||
|
<res-auth>Container</res-auth>
|
||||||
|
<res-sharing-scope>Shareable</res-sharing-scope>
|
||||||
|
</resource-ref>
|
||||||
|
<resource-ref>
|
||||||
|
<res-ref-name>jms/hsadminSystem-vm1110</res-ref-name>
|
||||||
|
<res-type>javax.jms.Queue</res-type>
|
||||||
|
<res-auth>Container</res-auth>
|
||||||
|
<res-sharing-scope>Shareable</res-sharing-scope>
|
||||||
|
</resource-ref>
|
||||||
<resource-ref>
|
<resource-ref>
|
||||||
<res-ref-name>jms/hsadminSystem-dns1</res-ref-name>
|
<res-ref-name>jms/hsadminSystem-dns1</res-ref-name>
|
||||||
<res-type>javax.jms.Queue</res-type>
|
<res-type>javax.jms.Queue</res-type>
|
||||||
@ -703,7 +785,7 @@
|
|||||||
<security-constraint>
|
<security-constraint>
|
||||||
<web-resource-collection>
|
<web-resource-collection>
|
||||||
<web-resource-name>Hostsharing Administrative Area</web-resource-name>
|
<web-resource-name>Hostsharing Administrative Area</web-resource-name>
|
||||||
<url-pattern>/*</url-pattern>
|
<url-pattern>/xmlrpc/*</url-pattern>
|
||||||
</web-resource-collection>
|
</web-resource-collection>
|
||||||
<user-data-constraint>
|
<user-data-constraint>
|
||||||
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
|
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
|
||||||
|
|||||||
@ -37,11 +37,21 @@
|
|||||||
</init-param>
|
</init-param>
|
||||||
</servlet>
|
</servlet>
|
||||||
|
|
||||||
|
<servlet>
|
||||||
|
<servlet-name>PillarServlet</servlet-name>
|
||||||
|
<servlet-class>de.hsadmin.pillar.JsonPillarServlet</servlet-class>
|
||||||
|
</servlet>
|
||||||
|
|
||||||
<servlet-mapping>
|
<servlet-mapping>
|
||||||
<servlet-name>Queue Status Servlet</servlet-name>
|
<servlet-name>Queue Status Servlet</servlet-name>
|
||||||
<url-pattern>/queueStatus</url-pattern>
|
<url-pattern>/queueStatus</url-pattern>
|
||||||
</servlet-mapping>
|
</servlet-mapping>
|
||||||
|
|
||||||
|
<servlet-mapping>
|
||||||
|
<servlet-name>PillarServlet</servlet-name>
|
||||||
|
<url-pattern>/pillar</url-pattern>
|
||||||
|
</servlet-mapping>
|
||||||
|
|
||||||
<servlet-mapping>
|
<servlet-mapping>
|
||||||
<servlet-name>XmlRpcServlet</servlet-name>
|
<servlet-name>XmlRpcServlet</servlet-name>
|
||||||
<url-pattern>/xmlrpc/*</url-pattern>
|
<url-pattern>/xmlrpc/*</url-pattern>
|
||||||
@ -96,14 +106,4 @@
|
|||||||
<res-sharing-scope>Shareable</res-sharing-scope>
|
<res-sharing-scope>Shareable</res-sharing-scope>
|
||||||
</resource-ref>
|
</resource-ref>
|
||||||
|
|
||||||
<security-constraint>
|
|
||||||
<web-resource-collection>
|
|
||||||
<web-resource-name>Hostsharing Administrative Area</web-resource-name>
|
|
||||||
<url-pattern>/*</url-pattern>
|
|
||||||
</web-resource-collection>
|
|
||||||
<user-data-constraint>
|
|
||||||
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
|
|
||||||
</user-data-constraint>
|
|
||||||
</security-constraint>
|
|
||||||
|
|
||||||
</web-app>
|
</web-app>
|
||||||
|
|||||||
@ -79,12 +79,16 @@ INSERT INTO component (basepacket_id, basecomponent_id, min_quantity, max_quanti
|
|||||||
--
|
--
|
||||||
INSERT INTO business_partner (member_id, member_code, member_since, shares_signed, free, indicator_vat, exempt_vat)
|
INSERT INTO business_partner (member_id, member_code, member_since, shares_signed, free, indicator_vat, exempt_vat)
|
||||||
VALUES (10000, 'hsh00-hsh', current_date, 0, TRUE, 'NET', FALSE);
|
VALUES (10000, 'hsh00-hsh', current_date, 0, TRUE, 'NET', FALSE);
|
||||||
|
INSERT INTO business_partner (member_id, member_code, member_since, shares_signed, free, indicator_vat, exempt_vat)
|
||||||
|
VALUES (20000, 'hsh00-aaa', current_date, 0, TRUE, 'NET', FALSE);
|
||||||
|
|
||||||
--
|
--
|
||||||
-- table: contact
|
-- table: contact
|
||||||
--
|
--
|
||||||
INSERT INTO contact (bp_id, salut, first_name, last_name, firma, email)
|
INSERT INTO contact (bp_id, salut, first_name, last_name, firma, email)
|
||||||
SELECT bp_id, 'Herr', 'Uwe', 'Mueller', 'Hostsharing eG', 'service@hostsharing.net' FROM business_partner WHERE member_id=10000;
|
SELECT bp_id, 'Herr', 'Uwe', 'Mueller', 'Hostsharing eG', 'service@hostsharing.net' FROM business_partner WHERE member_id=10000;
|
||||||
|
INSERT INTO contact (bp_id, salut, first_name, last_name, firma, email)
|
||||||
|
SELECT bp_id, 'Herr', 'Ömer-Günther', 'Janßen-Müller', '', 'test@example.net' FROM business_partner WHERE member_id=20000;
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Table: inet_addr
|
-- Table: inet_addr
|
||||||
@ -164,6 +168,12 @@ INSERT INTO packet_component (basecomponent_id, packet_id, quantity, created)
|
|||||||
INSERT INTO unixuser (name, comment, shell, homedir, locked, packet_id, userid)
|
INSERT INTO unixuser (name, comment, shell, homedir, locked, packet_id, userid)
|
||||||
SELECT 'hsh00', 'packet hsh00', '/bin/bash', '/home/pacs/hsh00', FALSE, packet_id, 10001 FROM packet
|
SELECT 'hsh00', 'packet hsh00', '/bin/bash', '/home/pacs/hsh00', FALSE, packet_id, 10001 FROM packet
|
||||||
WHERE packet_name='hsh00';
|
WHERE packet_name='hsh00';
|
||||||
|
INSERT INTO unixuser (name, comment, shell, homedir, locked, packet_id, userid)
|
||||||
|
SELECT 'hsh00-hsh', 'member hsh', '/bin/bash', '/home/pacs/hsh00/users/hsh', FALSE, packet_id, 10003 FROM packet
|
||||||
|
WHERE packet_name='hsh00';
|
||||||
|
INSERT INTO unixuser (name, comment, shell, homedir, locked, packet_id, userid)
|
||||||
|
SELECT 'hsh00-aaa', 'member aaa', '/bin/bash', '/home/pacs/hsh00/users/aaa', FALSE, packet_id, 10003 FROM packet
|
||||||
|
WHERE packet_name='hsh00';
|
||||||
INSERT INTO unixuser (name, comment, shell, homedir, locked, packet_id, userid)
|
INSERT INTO unixuser (name, comment, shell, homedir, locked, packet_id, userid)
|
||||||
SELECT 'hsh01', 'packet hsh01', '/bin/bash', '/home/pacs/hsh01', FALSE, packet_id, 10002 FROM packet
|
SELECT 'hsh01', 'packet hsh01', '/bin/bash', '/home/pacs/hsh01', FALSE, packet_id, 10002 FROM packet
|
||||||
WHERE packet_name='hsh01';
|
WHERE packet_name='hsh01';
|
||||||
@ -196,7 +206,9 @@ INSERT INTO domain_option (domain_option_name)
|
|||||||
INSERT INTO domain_option (domain_option_name)
|
INSERT INTO domain_option (domain_option_name)
|
||||||
VALUES ('letsencrypt');
|
VALUES ('letsencrypt');
|
||||||
INSERT INTO domain_option (domain_option_name)
|
INSERT INTO domain_option (domain_option_name)
|
||||||
VALUES ('php5');
|
VALUES ('autoconfig');
|
||||||
|
INSERT INTO domain_option (domain_option_name)
|
||||||
|
VALUES ('dkim');
|
||||||
|
|
||||||
--
|
--
|
||||||
-- table: price_list
|
-- table: price_list
|
||||||
|
|||||||
@ -1,2 +1,85 @@
|
|||||||
ALTER TABLE queue_task ADD COLUMN login_user character varying(48);
|
DROP VIEW ipconfig;
|
||||||
ALTER TABLE queue_task ADD COLUMN runas_user character varying(48);
|
|
||||||
|
ALTER TABLE packet
|
||||||
|
ALTER COLUMN packet_name TYPE VARCHAR(6);
|
||||||
|
ALTER TABLE packet
|
||||||
|
ALTER COLUMN hive_id DROP NOT NULL;
|
||||||
|
|
||||||
|
UPDATE packet SET packet_name='vm10' || substr(packet_name,4,2) WHERE packet_name LIKE 'srv%';
|
||||||
|
|
||||||
|
CREATE VIEW ipconfig AS
|
||||||
|
SELECT DISTINCT ON (theunion.ipv4) theunion.ipv4,
|
||||||
|
theunion.name,
|
||||||
|
theunion.alias,
|
||||||
|
theunion.hivename
|
||||||
|
FROM ( SELECT h.hive_name AS hivename,
|
||||||
|
ip.inet_addr AS ipv4,
|
||||||
|
'eth0:'::text || p.packet_name::text AS alias,
|
||||||
|
p.packet_name AS name,
|
||||||
|
2 AS prio
|
||||||
|
FROM inet_addr ip
|
||||||
|
JOIN packet p ON p.cur_inet_addr_id = ip.inet_addr_id
|
||||||
|
JOIN hive h ON h.hive_id = p.hive_id
|
||||||
|
UNION
|
||||||
|
SELECT h.hive_name AS hivename,
|
||||||
|
ip.inet_addr AS ipv4,
|
||||||
|
'eth0'::text AS alias,
|
||||||
|
h.hive_name AS name,
|
||||||
|
1 AS prio
|
||||||
|
FROM inet_addr ip
|
||||||
|
JOIN hive h ON h.inet_addr_id = ip.inet_addr_id
|
||||||
|
ORDER BY 2, 5) theunion;
|
||||||
|
|
||||||
|
INSERT INTO basepacket (basepacket_code, description, sorting, valid, article_number)
|
||||||
|
VALUES ('SRV/CLD', 'Cloud Server', 0, true, 3000);
|
||||||
|
|
||||||
|
INSERT INTO basecomponent (basecomponent_code, description, sorting, valid)
|
||||||
|
VALUES ('BANDWIDTH', 'Bandbreite 95/5 (Mbit/s)', 0, true);
|
||||||
|
|
||||||
|
INSERT INTO basecomponent (basecomponent_code, description, sorting, valid)
|
||||||
|
VALUES ('SLAINFR8H', 'HS Ext. Support (24x7 8h) for Infrastructure', 0, true);
|
||||||
|
INSERT INTO basecomponent (basecomponent_code, description, sorting, valid)
|
||||||
|
VALUES ('SLAINFR4H', 'HS Ext. Support (24x7 4h) for Infrastructure', 0, true);
|
||||||
|
INSERT INTO basecomponent (basecomponent_code, description, sorting, valid)
|
||||||
|
VALUES ('SLAINFR2H', 'HS Ext. Support (24x7 2h) for Infrastructure', 0, true);
|
||||||
|
|
||||||
|
INSERT INTO component (basepacket_id, basecomponent_id, min_quantity, max_quantity, default_quantity, increment_quantity, include_quantity, admin_only, article_number)
|
||||||
|
SELECT basepacket_id, basecomponent_id, 1, 102400000, 1, 1, 0, false, 3011 FROM basepacket, basecomponent WHERE basepacket_code='SRV/CLD' AND basecomponent_code='CPU';
|
||||||
|
INSERT INTO component (basepacket_id, basecomponent_id, min_quantity, max_quantity, default_quantity, increment_quantity, include_quantity, admin_only, article_number)
|
||||||
|
SELECT basepacket_id, basecomponent_id, 1024, 102400000, 1024, 1024, 0, false, 3012 FROM basepacket, basecomponent WHERE basepacket_code='SRV/CLD' AND basecomponent_code='RAM';
|
||||||
|
INSERT INTO component (basepacket_id, basecomponent_id, min_quantity, max_quantity, default_quantity, increment_quantity, include_quantity, admin_only, article_number)
|
||||||
|
SELECT basepacket_id, basecomponent_id, 0, 102400000, 250, 250, 0, false, 3013 FROM basepacket, basecomponent WHERE basepacket_code='SRV/CLD' AND basecomponent_code='TRAFFIC';
|
||||||
|
INSERT INTO component (basepacket_id, basecomponent_id, min_quantity, max_quantity, default_quantity, increment_quantity, include_quantity, admin_only, article_number)
|
||||||
|
SELECT basepacket_id, basecomponent_id, 0, 1000, 0, 1, 0, false, 3017 FROM basepacket, basecomponent WHERE basepacket_code='SRV/CLD' AND basecomponent_code='BANDWIDTH';
|
||||||
|
INSERT INTO component (basepacket_id, basecomponent_id, min_quantity, max_quantity, default_quantity, increment_quantity, include_quantity, admin_only, article_number)
|
||||||
|
SELECT basepacket_id, basecomponent_id, 25600, 102400000, 25600, 25600, 0, false, 3014 FROM basepacket, basecomponent WHERE basepacket_code='SRV/CLD' AND basecomponent_code='QUOTA';
|
||||||
|
INSERT INTO component (basepacket_id, basecomponent_id, min_quantity, max_quantity, default_quantity, increment_quantity, include_quantity, admin_only, article_number)
|
||||||
|
SELECT basepacket_id, basecomponent_id, 0, 102400000, 0, 256000, 0, false, 3015 FROM basepacket, basecomponent WHERE basepacket_code='SRV/CLD' AND basecomponent_code='STORAGE';
|
||||||
|
|
||||||
|
INSERT INTO component (basepacket_id, basecomponent_id, min_quantity, max_quantity, default_quantity, increment_quantity, include_quantity, admin_only, article_number)
|
||||||
|
SELECT basepacket_id, basecomponent_id, 1, 1, 1, 1, 0, false, 3136 FROM basepacket, basecomponent WHERE basepacket_code='SRV/CLD' AND basecomponent_code='SLABASIC';
|
||||||
|
|
||||||
|
INSERT INTO component (basepacket_id, basecomponent_id, min_quantity, max_quantity, default_quantity, increment_quantity, include_quantity, admin_only, article_number)
|
||||||
|
SELECT basepacket_id, basecomponent_id, 0, 1, 0, 1, 0, false, 3122 FROM basepacket, basecomponent WHERE basepacket_code='SRV/CLD' AND basecomponent_code='SLAINFR8H';
|
||||||
|
INSERT INTO component (basepacket_id, basecomponent_id, min_quantity, max_quantity, default_quantity, increment_quantity, include_quantity, admin_only, article_number)
|
||||||
|
SELECT basepacket_id, basecomponent_id, 0, 1, 0, 1, 0, false, 3125 FROM basepacket, basecomponent WHERE basepacket_code='SRV/CLD' AND basecomponent_code='SLAINFR4H';
|
||||||
|
INSERT INTO component (basepacket_id, basecomponent_id, min_quantity, max_quantity, default_quantity, increment_quantity, include_quantity, admin_only, article_number)
|
||||||
|
SELECT basepacket_id, basecomponent_id, 0, 1, 0, 1, 0, false, 3151 FROM basepacket, basecomponent WHERE basepacket_code='SRV/CLD' AND basecomponent_code='SLAINFR2H';
|
||||||
|
|
||||||
|
INSERT INTO component (basepacket_id, basecomponent_id, min_quantity, max_quantity, default_quantity, increment_quantity, include_quantity, admin_only, article_number)
|
||||||
|
SELECT basepacket_id, basecomponent_id, 0, 1000, 0, 1, 0, false, 2017 FROM basepacket, basecomponent WHERE basepacket_code='SRV/MGD' AND basecomponent_code='BANDWIDTH';
|
||||||
|
UPDATE component SET min_quantity=0 WHERE component_id=38; -- min. Traffic für Managed Server auf 0
|
||||||
|
|
||||||
|
INSERT INTO price (article_number, price, vat, price_list) VALUES (3011, 15, 19.0, 1);
|
||||||
|
INSERT INTO price (article_number, price, vat, price_list) VALUES (3012, 5, 19.0, 1);
|
||||||
|
INSERT INTO price (article_number, price, vat, price_list) VALUES (3013, 5, 19.0, 1);
|
||||||
|
INSERT INTO price (article_number, price, vat, price_list) VALUES (3014, 5, 19.0, 1);
|
||||||
|
INSERT INTO price (article_number, price, vat, price_list) VALUES (3015, 5, 19.0, 1);
|
||||||
|
INSERT INTO price (article_number, price, vat, price_list) VALUES (3017, 2, 19.0, 1);
|
||||||
|
|
||||||
|
INSERT INTO price (article_number, price, vat, price_list) VALUES (3136, 10, 19.0, 1);
|
||||||
|
INSERT INTO price (article_number, price, vat, price_list) VALUES (3122, 40, 19.0, 1);
|
||||||
|
INSERT INTO price (article_number, price, vat, price_list) VALUES (3125, 80, 19.0, 1);
|
||||||
|
INSERT INTO price (article_number, price, vat, price_list) VALUES (3151, 160, 19.0, 1);
|
||||||
|
|
||||||
|
INSERT INTO price (article_number, price, vat, price_list) VALUES (2017, 2, 19.0, 1);
|
||||||
|
|||||||
@ -429,9 +429,9 @@ CREATE SEQUENCE packet_packet_id_seq
|
|||||||
CREATE TABLE packet (
|
CREATE TABLE packet (
|
||||||
packet_id integer DEFAULT nextval(('"packet_packet_id_seq"'::text)::regclass) NOT NULL,
|
packet_id integer DEFAULT nextval(('"packet_packet_id_seq"'::text)::regclass) NOT NULL,
|
||||||
basepacket_id integer NOT NULL,
|
basepacket_id integer NOT NULL,
|
||||||
packet_name character varying(5) NOT NULL,
|
packet_name character varying(6) NOT NULL,
|
||||||
bp_id integer NOT NULL,
|
bp_id integer NOT NULL,
|
||||||
hive_id integer NOT NULL,
|
hive_id integer,
|
||||||
created date NOT NULL,
|
created date NOT NULL,
|
||||||
cancelled date,
|
cancelled date,
|
||||||
free boolean NOT NULL,
|
free boolean NOT NULL,
|
||||||
@ -515,9 +515,11 @@ CREATE TABLE unixuser (
|
|||||||
homedir character varying(128) NOT NULL,
|
homedir character varying(128) NOT NULL,
|
||||||
locked boolean NOT NULL,
|
locked boolean NOT NULL,
|
||||||
packet_id integer NOT NULL,
|
packet_id integer NOT NULL,
|
||||||
quota_softlimit integer DEFAULT 0 NOT NULL,
|
|
||||||
userid integer NOT NULL,
|
userid integer NOT NULL,
|
||||||
|
quota_softlimit integer DEFAULT 0 NOT NULL,
|
||||||
quota_hardlimit integer DEFAULT 0,
|
quota_hardlimit integer DEFAULT 0,
|
||||||
|
storage_softlimit integer DEFAULT 0 NOT NULL,
|
||||||
|
storage_hardlimit integer DEFAULT 0,
|
||||||
CONSTRAINT unixuser_userid CHECK ((userid >= 10000))
|
CONSTRAINT unixuser_userid CHECK ((userid >= 10000))
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
BIN
hsarback/lib/commons-beanutils-1.9.2.jar
Normal file
BIN
hsarback/lib/commons-beanutils-1.9.2.jar
Normal file
Binary file not shown.
Binary file not shown.
BIN
hsarback/lib/commons-collections-3.2.2.jar
Normal file
BIN
hsarback/lib/commons-collections-3.2.2.jar
Normal file
Binary file not shown.
Binary file not shown.
BIN
hsarback/lib/commons-lang-2.6.jar
Normal file
BIN
hsarback/lib/commons-lang-2.6.jar
Normal file
Binary file not shown.
BIN
hsarback/lib/commons-lang3-3.9.jar
Normal file
BIN
hsarback/lib/commons-lang3-3.9.jar
Normal file
Binary file not shown.
Binary file not shown.
BIN
hsarback/lib/commons-logging-1.2.jar
Normal file
BIN
hsarback/lib/commons-logging-1.2.jar
Normal file
Binary file not shown.
Binary file not shown.
BIN
hsarback/lib/commons-pool-1.6.jar
Normal file
BIN
hsarback/lib/commons-pool-1.6.jar
Normal file
Binary file not shown.
BIN
hsarback/lib/hsadmin-util-4.0.5.jar
Normal file
BIN
hsarback/lib/hsadmin-util-4.0.5.jar
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
hsarback/lib/openjpa-2.4.3.jar
Normal file
BIN
hsarback/lib/openjpa-2.4.3.jar
Normal file
Binary file not shown.
BIN
hsarback/lib/org.apache.bval.bundle-0.5.jar
Normal file
BIN
hsarback/lib/org.apache.bval.bundle-0.5.jar
Normal file
Binary file not shown.
Binary file not shown.
BIN
hsarback/lib/serp-1.15.1.jar
Normal file
BIN
hsarback/lib/serp-1.15.1.jar
Normal file
Binary file not shown.
BIN
hsarback/lib/xbean-asm6-shaded-4.8.jar
Normal file
BIN
hsarback/lib/xbean-asm6-shaded-4.8.jar
Normal file
Binary file not shown.
125
hsarback/pom.xml
Normal file
125
hsarback/pom.xml
Normal file
@ -0,0 +1,125 @@
|
|||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<groupId>de.hsadmin</groupId>
|
||||||
|
<artifactId>hsar</artifactId>
|
||||||
|
<packaging>war</packaging>
|
||||||
|
<version>4.0.6</version>
|
||||||
|
<name>HSAdmin Stable Backend Webapp</name>
|
||||||
|
<url>http://maven.apache.org</url>
|
||||||
|
<properties>
|
||||||
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
|
<maven.compiler.source>11</maven.compiler.source>
|
||||||
|
<maven.compiler.target>11</maven.compiler.target>
|
||||||
|
</properties>
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>local</id>
|
||||||
|
<activation>
|
||||||
|
<activeByDefault>true</activeByDefault>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<resources>
|
||||||
|
<resource>
|
||||||
|
<directory>src/main/resources</directory>
|
||||||
|
</resource>
|
||||||
|
<resource>
|
||||||
|
<directory>src/main/local-resources</directory>
|
||||||
|
</resource>
|
||||||
|
</resources>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>de.hsadmin.core</groupId>
|
||||||
|
<artifactId>hsadmin-util</artifactId>
|
||||||
|
<version>4.0.6</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>de.hsadmin.core</groupId>
|
||||||
|
<artifactId>hsadmin-qserv</artifactId>
|
||||||
|
<version>4.0.6</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>commons-httpclient</groupId>
|
||||||
|
<artifactId>commons-httpclient</artifactId>
|
||||||
|
<version>3.1</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>commons-lang</groupId>
|
||||||
|
<artifactId>commons-lang</artifactId>
|
||||||
|
<version>2.6</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>commons-net</groupId>
|
||||||
|
<artifactId>commons-net</artifactId>
|
||||||
|
<version>3.9.0</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.xmlrpc</groupId>
|
||||||
|
<artifactId>xmlrpc-server</artifactId>
|
||||||
|
<version>3.1.3</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.xmlrpc</groupId>
|
||||||
|
<artifactId>xmlrpc-client</artifactId>
|
||||||
|
<version>3.1.3</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.velocity</groupId>
|
||||||
|
<artifactId>velocity-engine-core</artifactId>
|
||||||
|
<version>2.3</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.openjpa</groupId>
|
||||||
|
<artifactId>openjpa</artifactId>
|
||||||
|
<version>3.2.2</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>junit</groupId>
|
||||||
|
<artifactId>junit</artifactId>
|
||||||
|
<version>4.13.2</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.servlet</groupId>
|
||||||
|
<artifactId>javax.servlet-api</artifactId>
|
||||||
|
<version>4.0.1</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.activemq</groupId>
|
||||||
|
<artifactId>activemq-all</artifactId>
|
||||||
|
<version>5.18.1</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.geronimo.specs</groupId>
|
||||||
|
<artifactId>geronimo-jms_1.1_spec</artifactId>
|
||||||
|
<version>1.1.1</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
<build>
|
||||||
|
<finalName>hsar</finalName>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-war-plugin</artifactId>
|
||||||
|
<version>3.4.0</version>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
|
<version>3.11.0</version>
|
||||||
|
<configuration>
|
||||||
|
<source>11</source>
|
||||||
|
<target>11</target>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</project>
|
||||||
@ -1,15 +0,0 @@
|
|||||||
package de.hsadmin.core.model;
|
|
||||||
|
|
||||||
public interface AuthenticatedUser {
|
|
||||||
|
|
||||||
public long id();
|
|
||||||
|
|
||||||
public String getName();
|
|
||||||
|
|
||||||
public boolean hasHostmasterRole();
|
|
||||||
|
|
||||||
public boolean hasPacAdminRoleFor(AbstractEntity pac);
|
|
||||||
|
|
||||||
public boolean hasCustomerRoleFor(AbstractEntity customer);
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,117 +0,0 @@
|
|||||||
package de.hsadmin.core.model;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.security.GeneralSecurityException;
|
|
||||||
import java.security.SecureRandom;
|
|
||||||
import java.security.cert.CertificateException;
|
|
||||||
import java.security.cert.X509Certificate;
|
|
||||||
import java.util.Properties;
|
|
||||||
|
|
||||||
import javax.naming.Context;
|
|
||||||
import javax.naming.NamingException;
|
|
||||||
import javax.naming.directory.Attributes;
|
|
||||||
import javax.naming.ldap.InitialLdapContext;
|
|
||||||
import javax.naming.ldap.StartTlsRequest;
|
|
||||||
import javax.naming.ldap.StartTlsResponse;
|
|
||||||
import javax.net.ssl.SSLContext;
|
|
||||||
import javax.net.ssl.SSLSocketFactory;
|
|
||||||
import javax.net.ssl.TrustManager;
|
|
||||||
import javax.net.ssl.X509TrustManager;
|
|
||||||
|
|
||||||
import de.hsadmin.core.util.Config;
|
|
||||||
|
|
||||||
public class LdapDAO {
|
|
||||||
|
|
||||||
private InitialLdapContext ctx;
|
|
||||||
private StartTlsResponse tls;
|
|
||||||
|
|
||||||
public LdapUser read(final String uid) throws TechnicalException {
|
|
||||||
if (uid == null) {
|
|
||||||
throw new TechnicalException("uid is null");
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
String ldapDC = "dc=hostsharing,dc=net";
|
|
||||||
connect();
|
|
||||||
if (uid.length() == 2) {
|
|
||||||
ldapDC = "uid=" + uid + ",ou=users,ou=admins";
|
|
||||||
} else if (uid.length() > 4 && uid.charAt(3) == '-') {
|
|
||||||
ldapDC = "uid=" + uid + ",ou=users,ou=" + uid.substring(0, 3) + ",ou=customers";
|
|
||||||
} else {
|
|
||||||
throw new TechnicalException("no valid uid " + uid);
|
|
||||||
}
|
|
||||||
final LdapUser ldapUser = new LdapUser();
|
|
||||||
final Attributes ldapAttrs = ctx.getAttributes(ldapDC);
|
|
||||||
ldapUser.setUid(getSingleAttributValue(ldapAttrs, "uid"));
|
|
||||||
ldapUser.setNickname(getSingleAttributValue(ldapAttrs, "nickName"));
|
|
||||||
ldapUser.setSurname(getSingleAttributValue(ldapAttrs, "sn"));
|
|
||||||
ldapUser.setGivenname(getSingleAttributValue(ldapAttrs, "givenName"));
|
|
||||||
ldapUser.setMail(getSingleAttributValue(ldapAttrs, "mail"));
|
|
||||||
return ldapUser;
|
|
||||||
} catch (NamingException e) {
|
|
||||||
throw new TechnicalException(e);
|
|
||||||
} catch (GeneralSecurityException e) {
|
|
||||||
throw new TechnicalException(e);
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new TechnicalException(e);
|
|
||||||
} finally {
|
|
||||||
disconnect();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void connect() throws NamingException, GeneralSecurityException, IOException {
|
|
||||||
final Config conf = Config.getInstance();
|
|
||||||
final String ldapConnectString = conf.getProperty("ldap.connect.url");
|
|
||||||
final String bind = conf.getProperty("ldap.connect.bind");
|
|
||||||
final String passwd = conf.getProperty("ldap.connect.password");
|
|
||||||
final Properties env = new Properties();
|
|
||||||
env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
|
|
||||||
env.put("com.sun.jndi.ldap.connect.pool", "true");
|
|
||||||
env.put(Context.PROVIDER_URL, ldapConnectString);
|
|
||||||
ctx = new InitialLdapContext(env, null);
|
|
||||||
tls = (StartTlsResponse) ctx.extendedOperation(new StartTlsRequest());
|
|
||||||
final SSLContext sc = SSLContext.getInstance("TLSv1.2");
|
|
||||||
final TrustManager tm = new X509TrustManager() {
|
|
||||||
// TODO trusts everybody
|
|
||||||
@Override
|
|
||||||
public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
public X509Certificate[] getAcceptedIssuers() {
|
|
||||||
return new X509Certificate[0];
|
|
||||||
}
|
|
||||||
};
|
|
||||||
sc.init(null, new TrustManager[] { tm } , new SecureRandom());
|
|
||||||
final SSLSocketFactory ssf = sc.getSocketFactory();
|
|
||||||
tls.negotiate(ssf);
|
|
||||||
ctx.addToEnvironment(Context.SECURITY_AUTHENTICATION, "simple");
|
|
||||||
String principal = bind;
|
|
||||||
ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, principal);
|
|
||||||
ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, passwd);
|
|
||||||
ctx.reconnect(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getSingleAttributValue(final Attributes ldapAttrs, final String attributeName) throws NamingException {
|
|
||||||
return ldapAttrs.get(attributeName).getAll().next().toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void disconnect() {
|
|
||||||
if (tls != null) {
|
|
||||||
try {
|
|
||||||
tls.close();
|
|
||||||
} catch (IOException e) {
|
|
||||||
// dont care
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (ctx != null) {
|
|
||||||
try {
|
|
||||||
ctx.close();
|
|
||||||
} catch (NamingException e) {
|
|
||||||
// dont care
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,76 +0,0 @@
|
|||||||
package de.hsadmin.core.model;
|
|
||||||
|
|
||||||
public class LdapUser implements AuthenticatedUser {
|
|
||||||
|
|
||||||
private String uid;
|
|
||||||
private String nickname;
|
|
||||||
private String surname;
|
|
||||||
private String givenname;
|
|
||||||
private String mail;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public long id() {
|
|
||||||
return -1L;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
|
||||||
return uid;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean hasHostmasterRole() {
|
|
||||||
return uid != null && uid.length() == 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean hasPacAdminRoleFor(AbstractEntity pac) {
|
|
||||||
return hasHostmasterRole();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean hasCustomerRoleFor(AbstractEntity customer) {
|
|
||||||
return hasHostmasterRole();
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUid() {
|
|
||||||
return uid;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getNickname() {
|
|
||||||
return nickname;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getSurname() {
|
|
||||||
return surname;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getGivenname() {
|
|
||||||
return givenname;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getMail() {
|
|
||||||
return mail;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUid(String uid) {
|
|
||||||
this.uid = uid;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setNickname(String nickname) {
|
|
||||||
this.nickname = nickname;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setSurname(String surname) {
|
|
||||||
this.surname = surname;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setGivenname(String givenname) {
|
|
||||||
this.givenname = givenname;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setMail(String mail) {
|
|
||||||
this.mail = mail;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
package de.hsadmin.core.model;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Transiente User-Klasse. Entkoppelt das core-Paket vom UnixUser-Modul.
|
|
||||||
* @author Peter Hormanns
|
|
||||||
*/
|
|
||||||
public class LoginUser {
|
|
||||||
|
|
||||||
// TODO UnixUser Referenzen im Core-Paket ersetzen
|
|
||||||
private String login;
|
|
||||||
|
|
||||||
public LoginUser(String loginName) {
|
|
||||||
login = loginName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getLogin() {
|
|
||||||
return login;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean hasHostmasterRole() {
|
|
||||||
// TODO Auto-generated method stub
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
package de.hsadmin.core.util;
|
|
||||||
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import de.rrze.jpwgen.flags.PwGeneratorFlagBuilder;
|
|
||||||
import de.rrze.jpwgen.impl.PwGenerator;
|
|
||||||
|
|
||||||
public class PasswordTool {
|
|
||||||
|
|
||||||
public static PwGeneratorFlagBuilder flagBuilder = new PwGeneratorFlagBuilder();
|
|
||||||
public static Random random = new Random();
|
|
||||||
|
|
||||||
static {
|
|
||||||
flagBuilder.setIncludeCapitals();
|
|
||||||
flagBuilder.setIncludeNumerals();
|
|
||||||
// flagBuilder.setIncludeReducedSymbols();
|
|
||||||
flagBuilder.setFilterAmbiguous();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String generatePassword() {
|
|
||||||
String password = PwGenerator.generatePassword(17, flagBuilder.build(), 100, random);
|
|
||||||
return password;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
package de.hsadmin.hostsharing;
|
|
||||||
|
|
||||||
public class QuotaLimit {
|
|
||||||
|
|
||||||
public static final double BLOCK_QUOTA_FACTOR = 1.00;
|
|
||||||
public static final double BLOCK_LIMIT_FACTOR = 1.50;
|
|
||||||
public static final double FILE_QUOTA_FACTOR = 1.00;
|
|
||||||
public static final double FILE_LIMIT_FACTOR = 1.50;
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
//
|
|
||||||
// This file is managed by HSAdmin.
|
|
||||||
// Do not edit manually. Changes will be overwritten.
|
|
||||||
//
|
|
||||||
|
|
||||||
#foreach( $domain in ${domains} )
|
|
||||||
zone "${domain.name}" { type slave; file "sec.${domain.name}"; masters { ${domain.user.pac.hive.inetAddr.inetAddr}; }; };
|
|
||||||
#end
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
//
|
|
||||||
// This file is managed by HSAdmin.
|
|
||||||
// Do not edit manually. Changes will be overwritten.
|
|
||||||
//
|
|
||||||
|
|
||||||
#foreach( $domain in ${domains} )
|
|
||||||
zone "${domain.name}" { type master; file "pri.${domain.name}"; };
|
|
||||||
#end
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
$TTL 6H
|
|
||||||
${dom.name}. IN SOA ${dom.dnsMaster}.hostsharing.net. hostmaster.hostsharing.net. (
|
|
||||||
${sio} ; serial secs since Jan 1 1970
|
|
||||||
6H ; refresh (>=10000)
|
|
||||||
1H ; retry (>=1800)
|
|
||||||
1W ; expire
|
|
||||||
1H ; minimum
|
|
||||||
)
|
|
||||||
|
|
||||||
${dom.name}. IN NS dns1.hostsharing.net.
|
|
||||||
${dom.name}. IN NS dns2.hostsharing.net.
|
|
||||||
${dom.name}. IN NS dns3.hostsharing.net.
|
|
||||||
|
|
||||||
${dom.name}. IN MX 30 mailin1.hostsharing.net.
|
|
||||||
${dom.name}. IN MX 30 mailin2.hostsharing.net.
|
|
||||||
${dom.name}. IN MX 30 mailin3.hostsharing.net.
|
|
||||||
|
|
||||||
${dom.name}. IN A ${pac.curINetAddr.inetAddr}
|
|
||||||
|
|
||||||
*.${dom.name}. IN MX 30 mailin1.hostsharing.net.
|
|
||||||
*.${dom.name}. IN MX 30 mailin2.hostsharing.net.
|
|
||||||
*.${dom.name}. IN MX 30 mailin3.hostsharing.net.
|
|
||||||
|
|
||||||
*.${dom.name}. IN A ${pac.curINetAddr.inetAddr}
|
|
||||||
@ -1,207 +0,0 @@
|
|||||||
package de.hsadmin.mods.pac;
|
|
||||||
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import javax.persistence.EntityManager;
|
|
||||||
|
|
||||||
import de.hsadmin.core.model.AbstractEntity;
|
|
||||||
import de.hsadmin.core.qserv.CompoundProcessor;
|
|
||||||
import de.hsadmin.core.qserv.CreateFileProcessor;
|
|
||||||
import de.hsadmin.core.qserv.EntityProcessorFactory;
|
|
||||||
import de.hsadmin.core.qserv.NullProcessor;
|
|
||||||
import de.hsadmin.core.qserv.Processor;
|
|
||||||
import de.hsadmin.core.qserv.ProcessorException;
|
|
||||||
import de.hsadmin.core.qserv.ShellProcessor;
|
|
||||||
import de.hsadmin.core.qserv.VelocityProcessor;
|
|
||||||
import de.hsadmin.core.qserv.WaitingTasksProcessor;
|
|
||||||
import de.hsadmin.core.util.PasswordTool;
|
|
||||||
import de.hsadmin.hostsharing.BasePacType;
|
|
||||||
import de.hsadmin.hostsharing.QuotaLimit;
|
|
||||||
import de.hsadmin.mods.user.UnixUser;
|
|
||||||
|
|
||||||
|
|
||||||
public class PacProcessorFactory implements EntityProcessorFactory {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public <T extends AbstractEntity> Processor createCreateProcessor(
|
|
||||||
EntityManager em, T entity) throws ProcessorException {
|
|
||||||
Pac pac = (Pac) entity;
|
|
||||||
String basepacName = pac.getBasepac().getName();
|
|
||||||
if (basepacName.equals(BasePacType.PAC_WEB)) {
|
|
||||||
String pacName = pac.getName();
|
|
||||||
Hive hive = pac.getHive();
|
|
||||||
UnixUser unixUser = getPacAdminUser(pac);
|
|
||||||
String password = PasswordTool.generatePassword();
|
|
||||||
return new CompoundProcessor(
|
|
||||||
createAddUserProc(pacName, unixUser, password),
|
|
||||||
createSetQuotaProc(pac),
|
|
||||||
createEtcHostsProc(hive),
|
|
||||||
createNetworkInterfacesProc(hive),
|
|
||||||
createIPTablesProc(),
|
|
||||||
createSudouersProc(hive),
|
|
||||||
createProftpdConfProc(hive),
|
|
||||||
createMakePacDirectoryStructure(unixUser),
|
|
||||||
createIfUp(pac),
|
|
||||||
createHttpdVirtualProc(hive),
|
|
||||||
createAccountingRulesProc());
|
|
||||||
} else {
|
|
||||||
return new NullProcessor();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public <T extends AbstractEntity> Processor createUpdateProcessor(EntityManager em, T entity)
|
|
||||||
throws ProcessorException {
|
|
||||||
Pac pac = (Pac) entity;
|
|
||||||
String basepacName = pac.getBasepac().getName();
|
|
||||||
if (basepacName.equals(BasePacType.PAC_WEB)) {
|
|
||||||
return createSetQuotaProc(pac);
|
|
||||||
} else {
|
|
||||||
return new NullProcessor();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public <T extends AbstractEntity> Processor createDeleteProcessor(EntityManager em, T entity) throws ProcessorException {
|
|
||||||
Pac pac = (Pac) entity;
|
|
||||||
String basepacName = pac.getBasepac().getName();
|
|
||||||
if (basepacName.equals(BasePacType.PAC_WEB)) {
|
|
||||||
Hive hive = pac.getHive();
|
|
||||||
hive.getPacs().remove(pac);
|
|
||||||
WaitingTasksProcessor waiting = new WaitingTasksProcessor(createDelUserProc(pac.getName()));
|
|
||||||
waiting.appendProcessor(pac.getHiveName(), new CompoundProcessor(
|
|
||||||
createIfDown(pac),
|
|
||||||
createEtcHostsProc(hive),
|
|
||||||
createNetworkInterfacesProc(hive),
|
|
||||||
createSudouersProc(hive),
|
|
||||||
createProftpdConfProc(hive),
|
|
||||||
createHttpdVirtualProc(hive),
|
|
||||||
createAccountingRulesProc()), "remove packet");
|
|
||||||
return waiting;
|
|
||||||
} else {
|
|
||||||
return new NullProcessor();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private Processor createAccountingRulesProc() {
|
|
||||||
return new ShellProcessor("mk-iptables-rules Accounting");
|
|
||||||
}
|
|
||||||
|
|
||||||
private Processor createHttpdVirtualProc(Hive hive) throws ProcessorException {
|
|
||||||
Processor domSetupProcessor = new CompoundProcessor(
|
|
||||||
new CreateFileProcessor("/de/hsadmin/mods/pac/httpd-virtual.vm", hive,
|
|
||||||
"/etc/apache2/conf.d/virtual.conf.tmp", "root", "root", "644", true),
|
|
||||||
new ShellProcessor("(diff -q /etc/apache2/conf.d/virtual.conf.tmp /etc/apache2/conf.d/virtual.conf"
|
|
||||||
+ " && rm /etc/apache2/conf.d/virtual.conf.tmp )"
|
|
||||||
+ " || ( mv /etc/apache2/conf.d/virtual.conf.tmp /etc/apache2/conf.d/virtual.conf "
|
|
||||||
+ " && invoke-rc.d apache2 reload >/dev/null 2>&1 ) "));
|
|
||||||
return domSetupProcessor;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Processor createEtcHostsProc(Hive hive) throws ProcessorException {
|
|
||||||
return new VelocityProcessor("/de/hsadmin/mods/pac/hosts.vm", hive, "/etc/hosts", true);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Processor createNetworkInterfacesProc(final Hive hive) throws ProcessorException {
|
|
||||||
return new VelocityProcessor("/de/hsadmin/mods/pac/pac-addr-ipv4.vm", hive, "/etc/network/pac-addr-ipv4", true);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Processor createIPTablesProc() {
|
|
||||||
return new ShellProcessor("mk-iptables-rules Accounting");
|
|
||||||
}
|
|
||||||
|
|
||||||
private Processor createSudouersProc(Hive hive) throws ProcessorException {
|
|
||||||
return new VelocityProcessor("/de/hsadmin/mods/pac/sudoers-pacs.vm", hive, "/etc/sudoers.d/pacs", true);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Processor createProftpdConfProc(Hive hive) throws ProcessorException {
|
|
||||||
return new VelocityProcessor("/de/hsadmin/mods/pac/proftpd-pacs-conf.vm", hive, "/etc/proftpd/pacs.conf", true);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Processor createAddUserProc(String pacName, UnixUser unixUser, String password) {
|
|
||||||
return new ShellProcessor(
|
|
||||||
"newusers", pacName + ":" + password + ":"
|
|
||||||
+ unixUser.getUserId() + ":" + unixUser.getUserId()
|
|
||||||
+ ":" + unixUser.getComment() + ":" + unixUser.getHomedir()
|
|
||||||
+ ":" + unixUser.getShell() + "\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
private Processor createSetQuotaProc(Pac pac) {
|
|
||||||
int quota = 128;
|
|
||||||
Set<PacComponent> pacComponents = pac.getPacComponents();
|
|
||||||
for (PacComponent pacComponent : pacComponents) {
|
|
||||||
BaseComponent baseComponent = pacComponent.getBaseComponent();
|
|
||||||
String feature = baseComponent.getFeature();
|
|
||||||
if ("QUOTA".equals(feature)) {
|
|
||||||
quota = pacComponent.getQuantity() * 1024;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
int blocksSoft = ((Double) (quota * QuotaLimit.BLOCK_QUOTA_FACTOR)).intValue();
|
|
||||||
int blocksHard = ((Double) (quota * QuotaLimit.BLOCK_LIMIT_FACTOR)).intValue();
|
|
||||||
int inodesSoft = ((Double) (quota * QuotaLimit.FILE_QUOTA_FACTOR)).intValue();
|
|
||||||
int inodesHard = ((Double) (quota * QuotaLimit.FILE_QUOTA_FACTOR)).intValue();
|
|
||||||
return new ShellProcessor("setquota -g " + pac.getName() + " "
|
|
||||||
+ blocksSoft + " " + blocksHard + " "
|
|
||||||
+ inodesSoft + " " + inodesHard + " "
|
|
||||||
+ "`df /home/pacs/ | tail -n1 | cut -d' ' -f1`");
|
|
||||||
}
|
|
||||||
|
|
||||||
private Processor createDelUserProc(String pacName) {
|
|
||||||
Processor killProcessesProc = new ShellProcessor("killall -TERM -u " + pacName + " && sleep 5 && killall -KILL -u " + pacName + " && sleep 5 || true");
|
|
||||||
Processor userdelProc = new ShellProcessor("deluser --remove-home " + pacName);
|
|
||||||
CompoundProcessor proc = new CompoundProcessor(killProcessesProc, userdelProc);
|
|
||||||
proc.appendProcessor(new ShellProcessor("rm -f '/var/spool/cron/crontabs/" + pacName + "'"));
|
|
||||||
proc.appendProcessor(new ShellProcessor("rm -f '/var/mail/" + pacName + "'"));
|
|
||||||
return proc;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Processor createMakePacDirectoryStructure(UnixUser unixUser) {
|
|
||||||
String homedir = unixUser.getHomedir();
|
|
||||||
String username = unixUser.getName();
|
|
||||||
return new ShellProcessor("chmod 711 " + homedir + " && " +
|
|
||||||
"su -l " + username + " -s \"/bin/bash\" -c \"mkdir -p " +
|
|
||||||
homedir + "/.bak " +
|
|
||||||
homedir + "/doms " +
|
|
||||||
homedir + "/etc " +
|
|
||||||
homedir + "/users " +
|
|
||||||
homedir + "/var " +
|
|
||||||
"\" && " +
|
|
||||||
"chmod 0700 " + homedir + "/.bak && " +
|
|
||||||
"chown httpd " + homedir + "/doms && " +
|
|
||||||
"chmod 1550 " + homedir + "/doms && " +
|
|
||||||
"chmod 700 " + homedir + "/etc && " +
|
|
||||||
"chmod 750 " + homedir + "/var && " +
|
|
||||||
"chmod 555 " + homedir + "/users"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Processor createIfUp(final Pac pac) {
|
|
||||||
// return new ShellProcessor("ifup eth0:" + pacName);
|
|
||||||
return new ShellProcessor("ip addr add "
|
|
||||||
+ pac.getCurINetAddr().getInetAddr()
|
|
||||||
+ "/32 dev eth0 label eth0:"
|
|
||||||
+ pac.getName()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Processor createIfDown(final Pac pac) {
|
|
||||||
// return new ShellProcessor("ifdown eth0:" + pacName);
|
|
||||||
return new ShellProcessor("ip addr del "
|
|
||||||
+ pac.getCurINetAddr().getInetAddr()
|
|
||||||
+ "/32 dev eth0 label eth0:"
|
|
||||||
+ pac.getName()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
private UnixUser getPacAdminUser(Pac pac) throws ProcessorException {
|
|
||||||
UnixUser unixUser = null;
|
|
||||||
Set<UnixUser> unixUserSet = pac.getUnixUser();
|
|
||||||
if (unixUserSet.size() == 1) {
|
|
||||||
unixUser = unixUserSet.iterator().next();
|
|
||||||
} else {
|
|
||||||
throw new ProcessorException("packet contains users");
|
|
||||||
}
|
|
||||||
return unixUser;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
#
|
|
||||||
# This file is managed by HSAdmin.
|
|
||||||
# Do not edit manually. Changes will be overwritten.
|
|
||||||
#
|
|
||||||
|
|
||||||
127.0.0.1 localhost
|
|
||||||
|
|
||||||
::1 ip6-localhost ip6-loopback
|
|
||||||
fe00::0 ip6-localnet
|
|
||||||
ff00::0 ip6-mcastprefix
|
|
||||||
ff02::1 ip6-allnodes
|
|
||||||
ff02::2 ip6-allrouters
|
|
||||||
ff02::3 ip6-allhosts
|
|
||||||
|
|
||||||
${hive.inetAddr.inetAddr} ${hive.name}.hostsharing.net ${hive.name} localhive
|
|
||||||
|
|
||||||
#foreach( $pac in ${hive.webpacs} )
|
|
||||||
${pac.curINetAddr.inetAddr} ${pac.name}.hostsharing.net ${pac.name}
|
|
||||||
#end
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
#
|
|
||||||
# This file is managed by HSAdmin.
|
|
||||||
# Do not edit manually. Changes will be overwritten.
|
|
||||||
#
|
|
||||||
|
|
||||||
#foreach( $pac in ${hive.webpacs} )
|
|
||||||
<VirtualHost ${pac.curINetAddr.inetAddr}:80>
|
|
||||||
ServerName _
|
|
||||||
ServerAdmin webmaster@${pac.name}.hostsharing.net
|
|
||||||
|
|
||||||
<Directory />
|
|
||||||
Redirect 404 /
|
|
||||||
ErrorDocument 404 "No virtual host configured for this host name."
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
</VirtualHost>
|
|
||||||
|
|
||||||
<VirtualHost ${pac.curINetAddr.inetAddr}:443>
|
|
||||||
ServerName _
|
|
||||||
ServerAdmin webmaster@${pac.name}.hostsharing.net
|
|
||||||
|
|
||||||
SSLEngine On
|
|
||||||
SSLCertificateFile /etc/apache2/pems-enabled/${pac.name}.hostsharing.net.crt
|
|
||||||
SSLCertificateKeyFile /etc/apache2/pems-enabled/${pac.name}.hostsharing.net.key
|
|
||||||
SSLCertificateChainFile /etc/apache2/pems-enabled/${pac.name}.hostsharing.net.chain
|
|
||||||
|
|
||||||
<Directory />
|
|
||||||
SSLRequireSSL On
|
|
||||||
Redirect 404 /
|
|
||||||
ErrorDocument 404 "No virtual host configured for this host name."
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
</VirtualHost>
|
|
||||||
|
|
||||||
#end
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
#
|
|
||||||
# This file is managed by HSAdmin.
|
|
||||||
# Do not edit manually. Changes will be overwritten.
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#foreach( $pac in ${hive.webpacs} )
|
|
||||||
eth0:${pac.name}:${pac.curINetAddr.inetAddr}/32
|
|
||||||
#end
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
#
|
|
||||||
# This file is managed by HSAdmin.
|
|
||||||
# Do not edit manually. Changes will be overwritten.
|
|
||||||
#
|
|
||||||
|
|
||||||
#foreach( $pac in ${hive.webpacs} )
|
|
||||||
<VirtualHost ${pac.curINetAddr.inetAddr}>
|
|
||||||
DefaultRoot ~ ${pac.name}
|
|
||||||
ServerName "${pac.name}.hostsharing.net"
|
|
||||||
AllowOverwrite on
|
|
||||||
AllowForeignAddress on
|
|
||||||
|
|
||||||
<Limit LOGIN>
|
|
||||||
Order allow,deny
|
|
||||||
AllowGroup ${pac.name}
|
|
||||||
DenyAll
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
<Anonymous /home/pacs/${pac.name}/ftp>
|
|
||||||
User ${pac.name}
|
|
||||||
Group ${pac.name}
|
|
||||||
UserAlias anonymous ${pac.name}
|
|
||||||
UserAlias ftp ${pac.name}
|
|
||||||
DirFakeUser on ftp
|
|
||||||
DirFakeGroup on ftp
|
|
||||||
DirFakeMode 000
|
|
||||||
AuthAliasOnly on
|
|
||||||
|
|
||||||
<Limit WRITE>
|
|
||||||
DenyAll
|
|
||||||
</Limit>
|
|
||||||
|
|
||||||
</Anonymous>
|
|
||||||
</VirtualHost>
|
|
||||||
|
|
||||||
#end
|
|
||||||
|
|
||||||
264
hsarback/src/main/java/de/hsadmin/pillar/JsonPillarServlet.java
Normal file
264
hsarback/src/main/java/de/hsadmin/pillar/JsonPillarServlet.java
Normal file
@ -0,0 +1,264 @@
|
|||||||
|
package de.hsadmin.pillar;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.PrintWriter;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Iterator;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.TreeMap;
|
||||||
|
|
||||||
|
import javax.persistence.EntityManager;
|
||||||
|
import javax.persistence.Query;
|
||||||
|
import javax.servlet.ServletException;
|
||||||
|
import javax.servlet.http.HttpServlet;
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import org.apache.commons.httpclient.HttpStatus;
|
||||||
|
|
||||||
|
import de.hsadmin.core.model.SelectableValue;
|
||||||
|
import de.hsadmin.core.model.Transaction;
|
||||||
|
import de.hsadmin.core.util.HSAdminException;
|
||||||
|
import de.hsadmin.core.util.IPv6Trick;
|
||||||
|
import de.hsadmin.mods.dom.Domain;
|
||||||
|
import de.hsadmin.mods.dom.DomainOption;
|
||||||
|
import de.hsadmin.mods.dom.DomainOptionValues;
|
||||||
|
import de.hsadmin.mods.pac.Hive;
|
||||||
|
import de.hsadmin.mods.pac.INetAddress;
|
||||||
|
import de.hsadmin.mods.pac.Pac;
|
||||||
|
import de.hsadmin.mods.pac.PacComponent;
|
||||||
|
import de.hsadmin.mods.user.UnixUser;
|
||||||
|
|
||||||
|
public class JsonPillarServlet extends HttpServlet {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
private static final DomainOptionValues domainOptionValues = new DomainOptionValues();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
|
||||||
|
final String remoteAddr = req.getRemoteAddr();
|
||||||
|
if (!IPv6Trick.isKnownRemote(remoteAddr)) {
|
||||||
|
resp.sendError(HttpStatus.SC_UNAUTHORIZED);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final Transaction transaction = new Transaction("pillar");
|
||||||
|
final EntityManager em = transaction.getEntityManager();
|
||||||
|
final String hiveFqdn = req.getParameter("hive");
|
||||||
|
String hiveName = "";
|
||||||
|
if (hiveFqdn != null && hiveFqdn.length() == 19 && hiveFqdn.endsWith(".hostsharing.net") && hiveFqdn.startsWith("h")) {
|
||||||
|
hiveName = hiveFqdn.substring(0, 3);
|
||||||
|
} else {
|
||||||
|
if (hiveFqdn != null && hiveFqdn.length() == 20 && hiveFqdn.endsWith(".hostsharing.net") && hiveFqdn.startsWith("h")) {
|
||||||
|
hiveName = hiveFqdn.substring(0, 4);
|
||||||
|
} else {
|
||||||
|
if (hiveFqdn != null && hiveFqdn.length() == 22 && hiveFqdn.endsWith(".hostsharing.net") && hiveFqdn.startsWith("vm")) {
|
||||||
|
hiveName = hiveFqdn.substring(0, 6);
|
||||||
|
} else {
|
||||||
|
em.close();
|
||||||
|
throw new ServletException("error in hive parameter");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
final Set<String> domainadmins = new HashSet<>();
|
||||||
|
final Query hiveQuery = em.createQuery("SELECT h FROM Hives h WHERE h.name = :hive");
|
||||||
|
hiveQuery.setParameter("hive", hiveName);
|
||||||
|
final Object hiveResult = hiveQuery.getSingleResult();
|
||||||
|
final Hive hive = (Hive) hiveResult;
|
||||||
|
final Map<String, Boolean> dnsZones = new HashMap<>();
|
||||||
|
final Query pacsQuery = em.createQuery("SELECT p FROM Pacs p WHERE p.hive.name = :hive AND p.basepac.name = 'PAC/WEB' ORDER BY p.name");
|
||||||
|
pacsQuery.setParameter("hive", hiveName);
|
||||||
|
final List<?> pacsResult = pacsQuery.getResultList();
|
||||||
|
resp.setContentType("text/plain");
|
||||||
|
final PrintWriter writer = resp.getWriter();
|
||||||
|
writer.println("{");
|
||||||
|
writer.println(" \"hivename\": \"" + hive.getHiveName() + "\"");
|
||||||
|
final INetAddress inetAddr = hive.getInetAddr();
|
||||||
|
writer.println(" , \"hiveipv4\": \"" + inetAddr.getInet4Addr() + "\"");
|
||||||
|
try {
|
||||||
|
writer.println(" , \"hiveipv4gateway\": \"" + inetAddr.getInet4Gateway() + "\"");
|
||||||
|
} catch (HSAdminException e) {
|
||||||
|
// dont care
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
writer.println(" , \"hiveipv6\": \"" + inetAddr.getInet6Addr() + "\"");
|
||||||
|
writer.println(" , \"hiveipv6gateway\": \"" + inetAddr.getInet6Gateway() + "\"");
|
||||||
|
} catch (HSAdminException e) {
|
||||||
|
// dont care
|
||||||
|
}
|
||||||
|
final long currentTimeSeconds = System.currentTimeMillis() / 1000L;
|
||||||
|
writer.println(" , \"currenttimeseconds\": \"" + currentTimeSeconds + "\"");
|
||||||
|
final Query domsQuery = em.createQuery("SELECT d FROM Domains d WHERE d.user.pac.hive.name = :hive ORDER BY d.name");
|
||||||
|
domsQuery.setParameter("hive", hiveName);
|
||||||
|
final List<?> domsResult = domsQuery.getResultList();
|
||||||
|
writer.println(" , \"doms\": [");
|
||||||
|
final Iterator<?> domsIterator = domsResult.iterator();
|
||||||
|
boolean firstLoopDoms = true;
|
||||||
|
while (domsIterator.hasNext()) {
|
||||||
|
final Domain dom = (Domain) domsIterator.next();
|
||||||
|
final String domName = dom.getName();
|
||||||
|
dnsZones.put(domName, Boolean.FALSE);
|
||||||
|
final Map<String, Boolean> domainOpts = new HashMap<>();
|
||||||
|
for (final SelectableValue val : domainOptionValues.get()) {
|
||||||
|
domainOpts.put(val.getName(), Boolean.FALSE);
|
||||||
|
}
|
||||||
|
final Set<DomainOption> domainOptionNames = dom.getDomainoptions();
|
||||||
|
for (final DomainOption opt: domainOptionNames) {
|
||||||
|
final String optName = opt.getName();
|
||||||
|
domainOpts.put(optName, Boolean.TRUE);
|
||||||
|
}
|
||||||
|
if (firstLoopDoms) {
|
||||||
|
firstLoopDoms = false;
|
||||||
|
writer.println(" {");
|
||||||
|
} else {
|
||||||
|
writer.println(" , {");
|
||||||
|
}
|
||||||
|
final UnixUser domUser = dom.getUser();
|
||||||
|
final String domUserName = domUser.getName();
|
||||||
|
domainadmins.add(domUserName);
|
||||||
|
final Pac domPac = domUser.getPac();
|
||||||
|
final String validSubdomainNames = dom.getValidsubdomainnames();
|
||||||
|
final INetAddress domINetAddr = domPac.getCurINetAddr();
|
||||||
|
writer.println(" \"domain\": \"" + domName + "\"");
|
||||||
|
writer.println(" , \"pac\": \"" + domPac.getName() + "\"");
|
||||||
|
writer.println(" , \"user\": \"" + domUserName + "\"");
|
||||||
|
writer.println(" , \"ipv4\": \"" + domINetAddr.getInet4Addr() + "\"");
|
||||||
|
try {
|
||||||
|
writer.println(" , \"ipv6\": \"" + domINetAddr.getInet6Addr() + "\"");
|
||||||
|
} catch (HSAdminException e) {
|
||||||
|
// dont care
|
||||||
|
}
|
||||||
|
writer.println(" , \"opts\": {");
|
||||||
|
boolean firstLoopOpts = true;
|
||||||
|
for (final SelectableValue val : domainOptionValues.get()) {
|
||||||
|
final String optName = val.getName();
|
||||||
|
final Boolean optValue = domainOpts.get(optName);
|
||||||
|
if ("letsencrypt".equals(optName)) {
|
||||||
|
dnsZones.put(domName, optValue);
|
||||||
|
}
|
||||||
|
if (firstLoopOpts) {
|
||||||
|
firstLoopOpts = false;
|
||||||
|
writer.println(" \"" + optName + "\": " + optValue.toString().toLowerCase());
|
||||||
|
} else {
|
||||||
|
writer.println(" , \"" + optName + "\": " + optValue.toString().toLowerCase());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
writer.println(" }");
|
||||||
|
writer.println(" , \"validsubdomains\": \"" + validSubdomainNames + "\"");
|
||||||
|
writer.println(" }");
|
||||||
|
}
|
||||||
|
writer.println(" ]");
|
||||||
|
writer.println(" , \"pacs\": [");
|
||||||
|
final Iterator<?> pacsIterator = pacsResult.iterator();
|
||||||
|
boolean firstLoopPacs = true;
|
||||||
|
while (pacsIterator.hasNext()) {
|
||||||
|
final Object result = pacsIterator.next();
|
||||||
|
final Pac pac = (Pac) result;
|
||||||
|
if (firstLoopPacs) {
|
||||||
|
firstLoopPacs = false;
|
||||||
|
writer.println(" {");
|
||||||
|
} else {
|
||||||
|
writer.println(" , {");
|
||||||
|
}
|
||||||
|
final String pacName = pac.getName();
|
||||||
|
final String pacDomain = pacName + ".hostsharing.net";
|
||||||
|
final INetAddress curINetAddr = pac.getCurINetAddr();
|
||||||
|
dnsZones.put(pacDomain, Boolean.FALSE);
|
||||||
|
writer.println(" \"pac\": \"" + pacName + "\"");
|
||||||
|
writer.println(" , \"ipv4\": \"" + curINetAddr.getInet4Addr() + "\"");
|
||||||
|
try {
|
||||||
|
writer.println(" , \"ipv6\": \"" + curINetAddr.getInet6Addr() + "\"");
|
||||||
|
} catch (HSAdminException e) {
|
||||||
|
// dont care
|
||||||
|
}
|
||||||
|
final PacComponent pacQuota = pac.getPacComponent("QUOTA");
|
||||||
|
if (pacQuota != null) {
|
||||||
|
int quota = pacQuota.getQuantity();
|
||||||
|
writer.println(" , \"quota\": " + quota);
|
||||||
|
}
|
||||||
|
final PacComponent pacStorage = pac.getPacComponent("STORAGE");
|
||||||
|
if (pacStorage != null) {
|
||||||
|
int storage = pacStorage.getQuantity();
|
||||||
|
writer.println(" , \"storage\": " + storage);
|
||||||
|
}
|
||||||
|
final PacComponent pacOffice = pac.getPacComponent("OFFICE");
|
||||||
|
if (pacOffice != null) {
|
||||||
|
int office = pacOffice.getQuantity();
|
||||||
|
writer.println(" , \"office\": \"" + office + "\"");
|
||||||
|
}
|
||||||
|
writer.println(" , \"users\": [");
|
||||||
|
boolean firstLoopUsers = true;
|
||||||
|
final Set<UnixUser> users = pac.getUnixUser();
|
||||||
|
final TreeMap<String, UnixUser> sortedUsersMap = new TreeMap<>();
|
||||||
|
long pacGroupId = 0L;
|
||||||
|
for (UnixUser user: users) {
|
||||||
|
if (pacName.equals(user.getName())) {
|
||||||
|
pacGroupId = user.getUserId();
|
||||||
|
}
|
||||||
|
sortedUsersMap.put(user.getName(), user);
|
||||||
|
}
|
||||||
|
for (String nextName: sortedUsersMap.keySet()) {
|
||||||
|
final UnixUser user = sortedUsersMap.get(nextName);
|
||||||
|
final String fullUsername = user.getName();
|
||||||
|
boolean isDomainAdmin = domainadmins.contains(fullUsername);
|
||||||
|
boolean isPacAdmin = pacName.equals(fullUsername);
|
||||||
|
final String shell = user.getShell();
|
||||||
|
boolean isLingering = "/bin/bash".equals(shell) || "/bin/dash".equals(shell)
|
||||||
|
|| "/bin/sh".equals(shell) || "/bin/zsh".equals(shell) || "/bin/tcsh".equals(shell) || "/bin/csh".equals(shell)
|
||||||
|
|| "/usr/bin/zsh".equals(shell) || "/usr/bin/tcsh".equals(shell);
|
||||||
|
if (firstLoopUsers) {
|
||||||
|
firstLoopUsers = false;
|
||||||
|
writer.println(" {");
|
||||||
|
} else {
|
||||||
|
writer.println(" , {");
|
||||||
|
}
|
||||||
|
final String usernamePostfix = fullUsername.length() > 6 ? fullUsername.substring(6) : "_";
|
||||||
|
writer.println(" \"user\": \"" + fullUsername + "\"");
|
||||||
|
writer.println(" , \"dirname\": \"" + usernamePostfix + "\"");
|
||||||
|
writer.println(" , \"uid\": " + user.getUserId());
|
||||||
|
writer.println(" , \"gid\": " + pacGroupId);
|
||||||
|
writer.println(" , \"comment\": \"" + quoteJSON(user.getComment()) + "\"");
|
||||||
|
writer.println(" , \"shell\": \"" + user.getShell() + "\"");
|
||||||
|
writer.println(" , \"homedir\": \"" + user.getHomedir() + "\"");
|
||||||
|
writer.println(" , \"quota_soft\": " + user.getQuotaSoftlimit());
|
||||||
|
writer.println(" , \"quota_hard\": " + user.getQuotaHardlimit());
|
||||||
|
writer.println(" , \"storage_soft\": " + user.getStorageSoftlimit());
|
||||||
|
writer.println(" , \"storage_hard\": " + user.getStorageHardlimit());
|
||||||
|
writer.println(" , \"is_domainadmin\": " + Boolean.toString(isDomainAdmin).toLowerCase());
|
||||||
|
writer.println(" , \"is_pacadmin\": " + Boolean.toString(isPacAdmin).toLowerCase());
|
||||||
|
writer.println(" , \"is_lingering\": " + Boolean.toString(isLingering).toLowerCase());
|
||||||
|
writer.println(" , \"has_maildir\": " + Boolean.toString(true).toLowerCase());
|
||||||
|
writer.println(" }");
|
||||||
|
}
|
||||||
|
writer.println(" ]");
|
||||||
|
writer.println(" }");
|
||||||
|
}
|
||||||
|
writer.println(" ]");
|
||||||
|
boolean firstLoopZones = true;
|
||||||
|
writer.println(" , \"zones\": [");
|
||||||
|
for (final String zone : dnsZones.keySet()) {
|
||||||
|
if (firstLoopZones) {
|
||||||
|
firstLoopZones = false;
|
||||||
|
writer.println(" {");
|
||||||
|
} else {
|
||||||
|
writer.println(" , {");
|
||||||
|
}
|
||||||
|
writer.println(" \"zone\": \"" + zone + "\"");
|
||||||
|
writer.println(" , \"acmeupdates\": " + dnsZones.get(zone).toString().toLowerCase());
|
||||||
|
writer.println(" }");
|
||||||
|
}
|
||||||
|
writer.println(" ]");
|
||||||
|
writer.println("}");
|
||||||
|
writer.close();
|
||||||
|
transaction.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
private String quoteJSON(final String unquoted) {
|
||||||
|
final String quoted = unquoted.replaceAll("\\\"", "\\\\\"");
|
||||||
|
return quoted;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -13,9 +13,10 @@ import de.hsadmin.core.model.AuthenticatedUser;
|
|||||||
import de.hsadmin.core.model.AuthenticationException;
|
import de.hsadmin.core.model.AuthenticationException;
|
||||||
import de.hsadmin.core.model.AuthorisationException;
|
import de.hsadmin.core.model.AuthorisationException;
|
||||||
import de.hsadmin.core.model.GenericModuleImpl;
|
import de.hsadmin.core.model.GenericModuleImpl;
|
||||||
import de.hsadmin.core.model.HSAdminException;
|
|
||||||
import de.hsadmin.core.model.ModuleInterface;
|
import de.hsadmin.core.model.ModuleInterface;
|
||||||
import de.hsadmin.core.model.Transaction;
|
import de.hsadmin.core.model.Transaction;
|
||||||
|
import de.hsadmin.core.util.HSAdminException;
|
||||||
|
import de.hsadmin.mods.user.UnixUser;
|
||||||
|
|
||||||
public abstract class AbstractRemote implements IRemote {
|
public abstract class AbstractRemote implements IRemote {
|
||||||
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user