summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xauth.sh1
-rw-r--r--build.xml2
-rwxr-xr-xclient.sh7
-rwxr-xr-xinput.sh1
-rw-r--r--log4j_auth_plugin.conf8
-rwxr-xr-xoutput.sh1
-rw-r--r--server.policy12
-rwxr-xr-xserver.sh7
-rw-r--r--src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java10
-rw-r--r--src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java25
-rw-r--r--src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java2
-rw-r--r--src/YalpClients/EflClient/list_test.edc50
-rw-r--r--src/YalpClients/EflClient/list_test_elem.py57
-rwxr-xr-xsrc/YalpClients/SwtClient/Model.java4
-rw-r--r--src/YalpServer/AuthPluginHandler.java1
-rw-r--r--src/yalp.idl1
-rwxr-xr-xstart-java.sh9
17 files changed, 25 insertions, 173 deletions
diff --git a/auth.sh b/auth.sh
new file mode 100755
index 0000000..dd0fe2f
--- /dev/null
+++ b/auth.sh
@@ -0,0 +1 @@
+java -Djava.library.path=./lib -jar yalpPGSqlAuth.jar -ORBInitialPort 1050 -ORBInitialHost localhost
diff --git a/build.xml b/build.xml
index f318f47..66b2b53 100644
--- a/build.xml
+++ b/build.xml
@@ -139,7 +139,7 @@
<manifest>
<attribute name="Built-By" value="${user.name}"/>
<attribute name="Main-Class" value="YalpAuth.YalpPGSqlAuth.YalpPGSqlAuth"/>
- <attribute name="Class-Path" value="${dbLibs} ${log4jLibs}"/>
+ <attribute name="Class-Path" value="${dbLibs}"/>
</manifest>
</jar>
</target>
diff --git a/client.sh b/client.sh
new file mode 100755
index 0000000..e8adf20
--- /dev/null
+++ b/client.sh
@@ -0,0 +1,7 @@
+export LD_LIBRARY_PATH=/usr/lib/jni
+CLASSPATH=/usr/share/java/swt.jar
+java -Dswt.library.path=/usr/lib/jni \
+-Djava.library.path=/usr/share/java -jar yalpSWTClient.jar \
+-cp /usr/share/java/swt-gtk-3.4.jar \
+-ORBInitialPort 1050 -ORBInitialHost localhost \
+-ORBInitRef NameService=corbaloc:iiop:localhost:1050/NameService
diff --git a/input.sh b/input.sh
new file mode 100755
index 0000000..b77419f
--- /dev/null
+++ b/input.sh
@@ -0,0 +1 @@
+java -Djava.library.path=./lib -jar yalpPGSqlInput.jar -ORBInitialPort 1050 -ORBInitialHost localhost
diff --git a/log4j_auth_plugin.conf b/log4j_auth_plugin.conf
deleted file mode 100644
index 79c355b..0000000
--- a/log4j_auth_plugin.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-log4j.rootLogger=debug, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-
-# Pattern to output the caller's file name and line number.
-log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
-
diff --git a/output.sh b/output.sh
new file mode 100755
index 0000000..cdad4fd
--- /dev/null
+++ b/output.sh
@@ -0,0 +1 @@
+java -Djava.library.path=./lib -jar yalpVlcTelnetOutput.jar -ORBInitialPort 1050 -ORBInitialHost localhost
diff --git a/server.policy b/server.policy
index 224e0c6..5ff3c7e 100644
--- a/server.policy
+++ b/server.policy
@@ -1,20 +1,8 @@
-<<<<<<< HEAD
grant {
permission java.io.FilePermission "<<ALL FILES>>","execute, read, write";
permission java.io.FilePermission "C:\\Programme\\VideoLAN\\VLC\\vlc","execute";
permission java.io.FilePermission "/Applications/VLC.app/Contents/MacOS/VLC","execute";
permission java.net.SocketPermission "*:1024-","connect,accept,resolve";
- permission java.net.SocketPermission "localhost:1050","connect,accept,resolve";
permission java.util.PropertyPermission "id3.default_language", "read";
permission java.util.PropertyPermission "id3.default_encoding", "read";
};
-=======
-grant {
- permission java.io.FilePermission "<<ALL FILES>>","execute, read, write";
- permission java.io.FilePermission "C:\\Programme\\VideoLAN\\VLC\\vlc","execute";
- permission java.io.FilePermission "/Applications/VLC.app/Contents/MacOS/VLC","execute";
- permission java.net.SocketPermission "*:1024-","connect,accept,resolve";
- permission java.util.PropertyPermission "id3.default_language", "read";
- permission java.util.PropertyPermission "id3.default_encoding", "read";
-};
->>>>>>> c62ff958823168d7622b397609220db8b67fa731
diff --git a/server.sh b/server.sh
index 66cd5fd..bb38d65 100755
--- a/server.sh
+++ b/server.sh
@@ -1,7 +1,4 @@
-/usr/bin/orbd \
--J-Djava.net.preferIPv4Stack=true \
--J-Dorg.omg.CORBA.ORBInitialHost=127.0.0.1 \
--ORBInitialPort 1050 -ORBInitialHost 127.0.0.1 &
+/usr/bin/orbd -ORBInitialPort 1050 &
sleep 4
-./start-java.sh yalpServer.jar
+java -Djava.library.path=./lib -jar yalpServer.jar -ORBInitialPort 1050 -ORBInitialHost localhost
killall -9 orbd
diff --git a/src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java b/src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java
index 6b6dd56..ba88ad4 100644
--- a/src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java
+++ b/src/YalpAuth/YalpPGSqlAuth/PGSqlAuth.java
@@ -92,16 +92,10 @@ 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);
-
- 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);
+ 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 3124845..d7c7a21 100644
--- a/src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java
+++ b/src/YalpAuth/YalpPGSqlAuth/YalpAuthPluginImpl.java
@@ -93,40 +93,31 @@ public class YalpAuthPluginImpl extends AuthPluginInterfacePOA{
YalpError error = new YalpError ("auth ok", YalpErrorCode.OK,
YalpErrorLevel.ERROR_LEVEL_INFO, "authentication module working");
- try {
- String query = "select * from \"Users\" where \"name\" = '"+username+"' and \"passwd\" = '"+passwd+"';";
-
- ResultSet result = stat.executeQuery(query);
+ try{
+ ResultSet result=stat.executeQuery("select * from \"user\" where \"username\" = '"+username+"' and \"passwd\" = '"+passwd+"';");
if (result.next()){
- if (result.getInt(1)>1)
+ if (result.getBoolean(5)==true)
{
- user.value = new YalpUser
- (666, username, "real name", AccessRights.ADMIN);
+ user.value.level = AccessRights.ADMIN;
err.value = error;
return;
}
else
{
- user.value = new YalpUser
- (666, username, "real name", AccessRights.USER);
+ user.value.level = AccessRights.USER;
err.value = error;
return;
}
}
else
{
- user.value = new YalpUser
- (666, username, "real name", AccessRights.DENY);
+ user.value.level = AccessRights.DENY;
err.value = error;
return;
}
-
- } catch (SQLException e){
- System.out.println("SQL ExceptioN!\n");
- e.printStackTrace();
- user.value = new YalpUser
- (666, username, "real name", AccessRights.DENY);
+ }catch (SQLException e){
+ user.value.level = 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/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java b/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java
index d497c3d..676fe3c 100644
--- a/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java
+++ b/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java
@@ -22,7 +22,7 @@ import YalpInterfaces.*;
*/
public class YalpPGSqlAuth {
- private YalpAuthPluginImpl con;
+ private YalpAuthInterfaceImpl con;
private DatabaseDefines config;
public static void main(String[] args)
diff --git a/src/YalpClients/EflClient/list_test.edc b/src/YalpClients/EflClient/list_test.edc
deleted file mode 100644
index f3b42e0..0000000
--- a/src/YalpClients/EflClient/list_test.edc
+++ /dev/null
@@ -1,50 +0,0 @@
-collections
-{
- group
- {
- name: "list";
- parts
- {
- part
- {
- name: "main";
- type: RECT;
- mouse_events: 0;
- description
- {
- state:"default" 0.0;
- rel1
- {
- relative: 0.0 0.0;
- offset: 0 0;
- }
- rel2
- {
- relative: 1.0 1.0;
- offset: 0 0;
- }
- }
- }
- part
- {
- name: "video";
- type: SWALLOW;
- description
- {
- state: "default"0.0;
- aspect: 1.7 1.8;
- rel1
- {
- relative: 0.0 0.0;
- offset: 0 0;
- }
- rel2
- {
- relative: 1.0 1.0;
- offset: 0 0;
- }
- }
- }
- }
- }
-}
diff --git a/src/YalpClients/EflClient/list_test_elem.py b/src/YalpClients/EflClient/list_test_elem.py
deleted file mode 100644
index a3fcc91..0000000
--- a/src/YalpClients/EflClient/list_test_elem.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env python
-
-import edje
-import ecore.evas
-import sys
-import os
-import ecore
-import emotion
-import evas
-import elementary
-
-def huhu(obj, it):
- print "guck guck";
-
-elementary.init()
-win = elementary.Window("test", elementary.ELM_WIN_BASIC);
-
-edje_file = os.path.join(os.path.dirname(sys.argv[0]),"list_test.edj")
-c = edje.Edje(win.canvas,file=edje_file,group="list")
-
-vid = emotion.Emotion(win.canvas,module_filename="xine");
-vid.file_set("/home/manut/Videos/2009-2.avi");
-
-c.part_swallow("video", vid)
-
-vid.resize(80,60);
-vid.show();
-vid.play = True;
-
-items = [("huhu",huhu),
- ("haha", huhu),
- ("hoho", huhu),
- ("hehe", huhu),
- ("hihi", huhu)];
-
-medialist = elementary.List(win);
-medialist.size_hint_weight_set(1.0, 1.0)
-medialist.size_hint_align_set(-1.0, -1.0)
-
-box0 = elementary.Box(win);
-box0.size_hint_weight_set(1.0, 1.0)
-win.resize_object_add(box0);
-box0.show();
-box0.pack_end(medialist);
-medialist.show();
-
-for item in items:
- print item[0]
- medialist.item_append(item[0], None, None, item[1]);
-
-medialist.go();
-
-win.resize(320,520);
-box0.show();
-win.show()
-#ecore.main_loop_begin();
-elementary.run();
diff --git a/src/YalpClients/SwtClient/Model.java b/src/YalpClients/SwtClient/Model.java
index ce25f54..0ebc09c 100755
--- a/src/YalpClients/SwtClient/Model.java
+++ b/src/YalpClients/SwtClient/Model.java
@@ -197,9 +197,7 @@ public class Model {
SessionHolder sess = new SessionHolder();
try{
// log on server
- this.srvCon.clientLogon(username, passwd,
- this.clientIP, sess, err);
-
+ this.srvCon.clientLogon(this.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 585e0f9..1011b69 100644
--- a/src/YalpServer/AuthPluginHandler.java
+++ b/src/YalpServer/AuthPluginHandler.java
@@ -42,7 +42,6 @@ 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 63fd10b..4c56fbb 100644
--- a/src/yalp.idl
+++ b/src/yalp.idl
@@ -103,7 +103,6 @@ enum Action {
typedef sequence<Action> Actions;
enum AccessType {
- UNKNOWN_INFO,
FILE,
FILES,
STREAM
diff --git a/start-java.sh b/start-java.sh
deleted file mode 100755
index 27a5be5..0000000
--- a/start-java.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-java \
--Dswt.library.path=/usr/lib/jni \
--Djava.net.preferIPv4Stack=true \
--Dorg.omg.CORBA.ORBInitialHost=127.0.0.1 \
--Djava.library.path=./lib \
--jar $@ \
--ORBInitialPort 1050 -ORBInitialHost 127.0.0.1 \
--ORBInitRef NameService=corbaloc:iiop:127.0.0.1:1050/NameService \
--ORBDottedDecimalAddresses 1
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-10 22:25:42 +0000