diff options
| -rw-r--r-- | build.xml | 232 | ||||
| -rw-r--r-- | src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java | 10 | ||||
| -rw-r--r-- | src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java | 25 | ||||
| -rwxr-xr-x | src/YalpClients/SwtClient/Model.java | 4 | ||||
| -rw-r--r-- | src/YalpServer/AuthPluginHandler.java | 1 | ||||
| -rw-r--r-- | src/yalp.idl | 1 | ||||
| -rwxr-xr-x | start-java.sh | 1 |
7 files changed, 31 insertions, 243 deletions
@@ -229,235 +229,3 @@ </target> </project> -======= -<?xml version="1.0" encoding="UTF-8"?> - -<project name="yalp" default="all" basedir="."> - <property name="srcInterfaces" value="src/YalpInterfaces"/> - - <property name="srcInputs" value="src/YalpInputs"/> - <property name="srcOutputs" value="src/YalpOutputs"/> - <property name="srcAuth" value="src/YalpAuth"/> - <property name="srcServer" value="src/YalpServer"/> - <property name="srcClients" value="src/YalpClients"/> - <property name="srcPgSqlInputIndexer" value="${srcInputs}/YalpPGSqlInput/YalpPGSQLIndexer"/> - <property name="srcVlcTelnetOutput" value="${srcOutputs}/YalpVlcTelnetOutput"/> - <property name="srcPGSqlInput" value="${srcInputs}/YalpPGSqlInput"/> - <property name="srcPGSqlAuth" value="${srcAuth}/YalpPGSqlAuth"/> - - <property name="srcSwtClient" value="${srcClients}/SwtClient"/> - <property name="srcSwtClientGUI" value="${srcSwtClient}/GUI"/> - - <property name="src" value="src/"/> - <property name="doc" value="doc/"/> - <property name="sqldoc" value="${doc}/sql"/> - <property name="javadoc" value="${doc}/java"/> - <property name="doxydoc" value="${doc}/doxygen"/> - <property name="build" value="build/"/> - <property name="lib" value="lib/"/> - - <property name="log4jLibs" value="lib/log4j-1.2.15.jar"/> - <property name="vlctelnetLibs" value="lib/commons-net-1.4.1.jar"/> - <property name="swtLibs" value="/usr/share/swt-3/lib/swt.jar /usr/lib/java/swt.jar /usr/share/java/swt.jar"/> - <property name="indexerLibs" value="lib/yajil-0.3.3.jar"/> - <property name="dbLibs" value="lib/postgresql-8.1-404.jdbc3.jar"/> - - <property name="idlj" value="../idlj.sh"/> - <property name="psqldoc" value="./postgresql_autodoc/postgresql_autodoc"/> - - <path id="project.class.path"> - <pathelement location="{lib}"/> - <pathelement path="${java.class.path}"/> - <pathelement path="${additional.path}"/> - </path> - - <target name="all" depends="vlctelnetoutput, pgsqlinput, pgsqlindexer, pgsqlauth, server, swtclient" description="builds server and client"> - <echo>Doing all</echo> - </target> - - <target name="interfaces" description="Create stubs/skeletons from idl"> - <mkdir dir="${build}"/> - <exec dir="${src}" executable="${idlj}"> - <arg value="yalp.idl"/> - </exec> - <javac srcdir="${srcInterfaces}" destdir="${build}"/> - </target> - - <target name ="server" depends="interfaces" description="builds the Server"> - <javac debug="true" srcdir="${srcServer}" destdir="${build}"/> - <jar destfile="yalpServer.jar" basedir="${build}"> - <path id="project.class.path"> - <pathelement location="${lib}"/> - <pathelement path="${java.class.path}"/> - <pathelement path="${additional.path}"/> - </path> - <manifest> - <attribute name="Built-By" value="${user.name}"/> - <attribute name="Main-Class" value="YalpServer.YalpServer"/> - <attribute name="Class-Path" value="${log4jLibs}"/> - </manifest> - </jar> - </target> - - <target name ="outputs" description="builds output base files"> - <javac debug="true" srcdir="${srcOutputs}" destdir="${build}"/> - </target> - - <target name ="vlctelnetoutput" depends="interfaces, outputs" description="builds the vlctelnetoutput"> - <javac debug="true" srcdir="${srcVlcTelnetOutput}" destdir="${build}"/> - <jar destfile="yalpVlcTelnetOutput.jar" basedir="${build}"> - <path id="project.class.path"> - <pathelement location="${lib}"/> - <pathelement path="${java.class.path}"/> - <pathelement path="${additional.path}"/> - </path> - <manifest> - <attribute name="Built-By" value="${user.name}"/> - <attribute name="Main-Class" value="YalpOutputs.YalpVlcTelnetOutput.YalpVlcTelnetOutput"/> - <attribute name="Class-Path" value="${vlctelnetLibs} ${log4jLibs}"/> - </manifest> - </jar> - </target> - - <target name ="inputs" description="builds input base files"> - <javac debug="true" srcdir="${srcInputs}" destdir="${build}"/> - </target> - - <target name ="pgsqlinput" depends="interfaces, inputs" description="builds the pgsql input plugin"> - <javac debug="true" srcdir="${srcPGSqlInput}" destdir="${build}"/> - <jar destfile="yalpPGSqlInput.jar" basedir="${build}"> - <path id="project.class.path"> - <pathelement location="${lib}"/> - <pathelement path="${java.class.path}"/> - <pathelement path="${additional.path}"/> - </path> - <manifest> - <attribute name="Built-By" value="${user.name}"/> - <attribute name="Main-Class" value="YalpInputs.YalpPGSqlInput.YalpPGSqlInput"/> - <attribute name="Class-Path" value="${dbLibs} ${log4jLibs}"/> - </manifest> - </jar> - </target> - - <target name="pgsqlindexer" description="indexer for pgsqlinputplugin"> - <mkdir dir="${build}/indexer"/> - <javac debug="true" srcdir="${srcPgSqlInputIndexer}" destdir="${build}/indexer"/> - <jar destfile="yalpPGSqlIndexer.jar" basedir="${build}"> - <path id="project.class.path"> - <pathelement location="${lib}"/> - <pathelement path="${java.class.path}"/> - <pathelement path="${additional.path}"/> - </path> - <manifest> - <attribute name="Built-By" value="${user.name}"/> - <attribute name="Main-Class" value="YalpInputs.YalpPGSqlInput.YalpPGSQLIndexer.YalpPGSQLIndexer"/> - <attribute name="Class-Path" value="${indexerLibs}"/> - </manifest> - </jar> - </target> - - <target name ="auth" description="builds auth base files"> - <javac debug="true" srcdir="${srcAuth}" destdir="${build}"/> - </target> - - <target name ="pgsqlauth" depends="interfaces, auth" description="builds the pgsql auth plugin"> - <javac debug="true" srcdir="${srcPGSqlAuth}" destdir="${build}"/> - <jar destfile="yalpPGSqlAuth.jar" basedir="${build}"> - <path id="project.class.path"> - <pathelement location="${lib}"/> - <pathelement path="${java.class.path}"/> - <pathelement path="${additional.path}"/> - </path> - <manifest> - <attribute name="Built-By" value="${user.name}"/> - <attribute name="Main-Class" value="YalpAuth.YalpPGSqlAuth.YalpPGSqlAuth"/> - <attribute name="Class-Path" value="${dbLibs}"/> - </manifest> - </jar> - </target> - - <target name ="clients" depends="interfaces" description="builds the client bsae files"> - <javac debug="true" srcdir="${srcClients}" destdir="${build}"/> - </target> - - <target name ="swtclient" depends="clients" description="builds SWT GUI"> - <javac debug="true" srcdir="${srcSwtClient}" destdir="${build}"/> - <jar destfile="yalpSWTClient.jar" basedir="${build}"> - <path id="project.class.path"> - <pathelement location="${lib}"/> - <pathelement path="${java.class.path}"/> - <pathelement path="${additional.path}"/> - </path> - <manifest> - <attribute name="Built-By" value="${user.name}"/> - <attribute name="Main-Class" value="YalpClients.SwtClient.SwtClient"/> - <attribute name="Class-Path" value="${swtLibs}"/> - </manifest> - </jar> - </target> - - <target name="swtgui" depends="swtclient"> - <javac debug="true" srcdir="${srcSwtGUI}" destdir="${build}"> - <classpath refid="project.class.path"/> - </javac> - </target> - - <target name="clean" depends="cleandoc" description="Removes previous build"> - <delete verbose="true"> - <fileset dir="${build}"/> - <fileset dir="${srcInterfaces}"/> - </delete> - </target> - - <target name="runserver" depends="server" description="starts Server"> - <java jar="server.jar" fork="true"/> - </target> - - <target name="runclient" depends="swtclient" description="starts Client"> - <java jar="client.jar" fork="true"/> - </target> - - <target name="cleandoc" depends="cleandoxydoc, cleansqldoc, cleanjavadoc"/> - - <target name="cleansqldoc" description="Removes previous sqldoc"> - <delete verbose="true"> - <fileset dir="${sqldoc}"/> - </delete> - </target> - - <target name="cleandoxydoc" description="Removes previous doxygen"> - <delete verbose="true"> - <fileset dir="${doxydoc}"/> - </delete> - </target> - - <target name="cleanjavadoc" description="Removes previous javadoc"> - <delete verbose="true"> - <fileset dir="${javadoc}"/> - </delete> - </target> - - <target name="doc" depends="cleandoc" description="generates javadoc"> - <javadoc packagenames="org.umlgraph.doclet.*, YalpAuth.*, YalpServer, YalpClients.*, YalpInterfaces, YalpOutputs.*, YalpInputs.*" sourcepath="src" author="true" version="true" private="true" use="true" destdir="${javadoc}"> - <doclet name="org.umlgraph.doclet.UmlGraphDoc" path="./build-tools/UmlGraph-5.2.jar"> - <param name="-inferrel"/> - <param name="-inferdep"/> - <param name="-hide" value="java.*"/> - <param name="-collpackages" value="java.util.*"/> - <param name="-qualify"/> - <param name="-postfixpackage"/> - <param name="-nodefontsize" value="9"/> - <param name="-nodefontpackagesize" value="7"/> - <param name="-link" value="http://java.sun.com/javase/6/docs/guide/javadoc/doclet/spec"/> - <param name="-link" value="http://java.sun.com/javase/6/docs/api"/> - </doclet> - </javadoc> - <exec dir="." executable="${psqldoc}"> - <arg line="-d yalp -f ${sqldoc}/yalp -h localhost -u yalp -p 5432 --password=yalp -l ./postgresql_autodoc"/> - </exec> - <exec dir="." executable="/usr/bin/doxygen"> - <arg line="yalp.doxy"/> - </exec> - </target> - -</project> diff --git a/src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java b/src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java index ba88ad4..6b6dd56 100644 --- a/src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java +++ b/src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java @@ -92,10 +92,16 @@ public class PGSqlAuth { NameComponent path[] = ncRef.to_name(name); ncRef.rebind(path, authPlugin); - PluginInfoHolder tmp = new PluginInfoHolder(pluginInfo); srvCon.ping(err); System.out.println(err.value.descr); - srvCon.registerAuthPlugin(authPlugin, tmp, err ); + + PluginInfoHolder tmp = new PluginInfoHolder(pluginInfo); + MediaType ms[] = new MediaType[1]; + ms[0] = MediaType.OTHER; + AccessInfo ai = new AccessInfo("", "", "", "", AccessType.UNKNOWN_INFO); + tmp.value.supportedTypes = ms; + tmp.value.access = ai; + srvCon.registerAuthPlugin(authPlugin, tmp, err); pluginInfo = tmp.value; if(err.value.code != YalpErrorCode.OK) diff --git a/src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java b/src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java index d7c7a21..3124845 100644 --- a/src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java +++ b/src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java @@ -93,31 +93,40 @@ public class YalpAuthPluginImpl extends AuthPluginInterfacePOA{ YalpError error = new YalpError ("auth ok", YalpErrorCode.OK, YalpErrorLevel.ERROR_LEVEL_INFO, "authentication module working"); - try{ - ResultSet result=stat.executeQuery("select * from \"user\" where \"username\" = '"+username+"' and \"passwd\" = '"+passwd+"';"); + try { + String query = "select * from \"Users\" where \"name\" = '"+username+"' and \"passwd\" = '"+passwd+"';"; + + ResultSet result = stat.executeQuery(query); if (result.next()){ - if (result.getBoolean(5)==true) + if (result.getInt(1)>1) { - user.value.level = AccessRights.ADMIN; + user.value = new YalpUser + (666, username, "real name", AccessRights.ADMIN); err.value = error; return; } else { - user.value.level = AccessRights.USER; + user.value = new YalpUser + (666, username, "real name", AccessRights.USER); err.value = error; return; } } else { - user.value.level = AccessRights.DENY; + user.value = new YalpUser + (666, username, "real name", AccessRights.DENY); err.value = error; return; } - }catch (SQLException e){ - user.value.level = AccessRights.DENY; + + } catch (SQLException e){ + System.out.println("SQL ExceptioN!\n"); + e.printStackTrace(); + user.value = new YalpUser + (666, username, "real name", AccessRights.DENY); error.code = YalpErrorCode.ERROR_SQL; error.msg = "failed to send auth request to pgsql db"; error.level = YalpErrorLevel.ERROR_LEVEL_ERROR; diff --git a/src/YalpClients/SwtClient/Model.java b/src/YalpClients/SwtClient/Model.java index 0ebc09c..ce25f54 100755 --- a/src/YalpClients/SwtClient/Model.java +++ b/src/YalpClients/SwtClient/Model.java @@ -197,7 +197,9 @@ public class Model { SessionHolder sess = new SessionHolder(); try{ // log on server - this.srvCon.clientLogon(this.userName,passwd,this.clientIP,sess,err); + this.srvCon.clientLogon(username, passwd, + this.clientIP, sess, err); + this.session = sess.value; this.userGroup = sess.value.me.level; /* diff --git a/src/YalpServer/AuthPluginHandler.java b/src/YalpServer/AuthPluginHandler.java index 1011b69..585e0f9 100644 --- a/src/YalpServer/AuthPluginHandler.java +++ b/src/YalpServer/AuthPluginHandler.java @@ -42,6 +42,7 @@ public class AuthPluginHandler { for (AuthPlugin plugin : plugins) { + System.out.println("LOGON: "+userName); plugin.itf.userVerify(userName, password, err, user); if (err.value.code == YalpErrorCode.OK) { diff --git a/src/yalp.idl b/src/yalp.idl index 4c56fbb..63fd10b 100644 --- a/src/yalp.idl +++ b/src/yalp.idl @@ -103,6 +103,7 @@ enum Action { typedef sequence<Action> Actions; enum AccessType { + UNKNOWN_INFO, FILE, FILES, STREAM diff --git a/start-java.sh b/start-java.sh index 9652578..27a5be5 100755 --- a/start-java.sh +++ b/start-java.sh @@ -1,4 +1,5 @@ java \ +-Dswt.library.path=/usr/lib/jni \ -Djava.net.preferIPv4Stack=true \ -Dorg.omg.CORBA.ORBInitialHost=127.0.0.1 \ -Djava.library.path=./lib \ |