Skip to content

Commit

Permalink
Updated for Guacamole 0.9.9
Browse files Browse the repository at this point in the history
  • Loading branch information
dn0 committed Oct 28, 2016
1 parent 3c21d8a commit ca72073
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 24 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
target/
.*.swp
.DS_Store
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
guacamole-auth-redis
====================

[Guacamole](http://guac-dev.org/) Redis authentication plugin.
[Guacamole](http://guac-dev.org/) Redis authentication extension.


Build
Expand All @@ -27,10 +27,10 @@ Install
Configure
---------

- Edit the Guacamole configuration file (`/etc/guacamole/guacamole.properties`):
- Edit the Guacamole configuration file (`guacamole.properties`):

# Auth provider class
auth-provider: com.erigones.guacamole.net.auth.redis.RedisAuthenticationProvider
auth-provider: org.erigones.guacamole.net.auth.RedisAuthenticationProvider

# Redis properties
redis-host: localhost
Expand Down
24 changes: 6 additions & 18 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
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>com.erigones.guacamole</groupId>
<groupId>org.erigones.guacamole</groupId>
<artifactId>guacamole-auth-redis</artifactId>
<packaging>jar</packaging>
<version>0.1.0</version>
<version>0.2.0</version>
<name>guacamole-auth-redis</name>
<url>https://github.com/erigones/guacamole-auth-redis</url>

Expand All @@ -19,6 +19,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
Expand All @@ -28,38 +29,25 @@
</build>

<dependencies>
<!-- SLF4J - logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
<version>1.6.1</version>
<scope>runtime</scope>
</dependency>

<!-- Guacamole Java API -->
<dependency>
<groupId>org.glyptodon.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
<version>0.8.0</version>
<version>0.9.9</version>
</dependency>

<!-- Guacamole Extension API -->
<dependency>
<groupId>org.glyptodon.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>0.8.1</version>
<version>0.9.9</version>
</dependency>

<!-- Jedis -->
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>2.2.1</version>
<version>2.9.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.erigones.guacamole.net.auth.redis;
package org.erigones.guacamole.net.auth;


import java.util.Map;
Expand All @@ -9,7 +9,7 @@
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
import redis.clients.jedis.JedisPoolConfig;
import com.erigones.guacamole.net.auth.redis.properties.RedisGuacamoleProperties;
import org.erigones.guacamole.net.auth.properties.RedisGuacamoleProperties;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.net.auth.Credentials;
import org.glyptodon.guacamole.net.auth.simple.SimpleAuthenticationProvider;
Expand Down Expand Up @@ -149,4 +149,9 @@ public Map<String, GuacamoleConfiguration> getAuthorizedConfigurations(Credentia
return new HashMap<String, GuacamoleConfiguration>();
}
}

@Override
public String getIdentifier() {
return "redis-auth";
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.erigones.guacamole.net.auth.redis.properties;
package org.erigones.guacamole.net.auth.properties;

import org.glyptodon.guacamole.properties.IntegerGuacamoleProperty;
import org.glyptodon.guacamole.properties.StringGuacamoleProperty;
Expand Down
8 changes: 8 additions & 0 deletions src/main/resources/guac-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"guacamoleVersion": "0.9.9",
"name": "Redis Authentication Extension",
"namespace": "guacamole-auth-redis",
"authProviders": [
"org.erigones.guacamole.net.auth.RedisAuthenticationProvider"
]
}

0 comments on commit ca72073

Please sign in to comment.