Merge branch 'sasl' of https://github.com/guodong000/memcached-cache into guodong000-sasl

Author: hazendaz

pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2012-2018 the original author or authors.
+       Copyright 2012-2019 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.

src/main/java/org/mybatis/caches/memcached/MemcachedClientWrapper.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2012-2018 the original author or authors.
+ *    Copyright 2012-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -24,9 +24,12 @@
 
 import net.spy.memcached.CASResponse;
 import net.spy.memcached.CASValue;
+import net.spy.memcached.ConnectionFactoryBuilder;
 import net.spy.memcached.MemcachedClient;
 import net.spy.memcached.internal.OperationFuture;
 
+import net.spy.memcached.auth.AuthDescriptor;
+import net.spy.memcached.auth.PlainCallbackHandler;
 import org.apache.ibatis.cache.CacheException;
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
@@ -81,7 +84,15 @@ public void setCas(long cas) {
   public MemcachedClientWrapper() {
     configuration = MemcachedConfigurationBuilder.getInstance().parseConfiguration();
     try {
-      client = new MemcachedClient(configuration.getConnectionFactory(), configuration.getAddresses());
+      if (configuration.isUsingSASL()) {
+        AuthDescriptor ad = new AuthDescriptor(new String[] { "PLAIN" },
+            new PlainCallbackHandler(configuration.getUsername(), configuration.getPassword()));
+        client = new MemcachedClient(new ConnectionFactoryBuilder()
+            .setProtocol(ConnectionFactoryBuilder.Protocol.BINARY).setAuthDescriptor(ad).build(),
+            configuration.getAddresses());
+      } else {
+        client = new MemcachedClient(configuration.getConnectionFactory(), configuration.getAddresses());
+      }
     } catch (IOException e) {
       String message = "Impossible to instantiate a new memecached client instance, see nested exceptions";
       LOG.error(message, e);

src/main/java/org/mybatis/caches/memcached/MemcachedConfiguration.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2012-2018 the original author or authors.
+ *    Copyright 2012-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -70,6 +70,21 @@ final class MemcachedConfiguration {
    */
   private TimeUnit timeUnit;
 
+  /**
+   * The flag to enable SASL Connection
+   */
+  private boolean usingSASL;
+
+  /**
+   * The Memcached SASL username
+   */
+  private String username;
+
+  /**
+   * The Memcached SASL password
+   */
+  private String password;
+
   /**
    * @return the keyPrefix
    */
@@ -190,13 +205,58 @@ public void setTimeUnit(TimeUnit timeUnit) {
     this.timeUnit = timeUnit;
   }
 
+  /**
+   * @return the usingSASL
+   */
+  public boolean isUsingSASL() {
+    return usingSASL;
+  }
+
+  /**
+   * @param usingSASL
+   *          the usingSASL to set
+   */
+  public void setUsingSASL(boolean usingSASL) {
+    this.usingSASL = usingSASL;
+  }
+
+  /**
+   * @return the username
+   */
+  public String getUsername() {
+    return username;
+  }
+
+  /**
+   * @param username
+   *          the username to set
+   */
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  /**
+   * @return the password
+   */
+  public String getPassword() {
+    return password;
+  }
+
+  /**
+   * @param password
+   *          the password to set
+   */
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
   /**
    * {@inheritDoc}
    */
   @Override
   public int hashCode() {
     return hash(1, 31, addresses, compressionEnabled, connectionFactory, expiration, keyPrefix, timeUnit, timeout,
-        usingAsyncGet);
+        usingAsyncGet, usingSASL, username, password);
   }
 
   /**
@@ -234,7 +294,8 @@ public boolean equals(Object obj) {
     return eq(addresses, other.addresses) && eq(compressionEnabled, other.compressionEnabled)
         && eq(connectionFactory, other.connectionFactory) && eq(expiration, other.expiration)
         && eq(keyPrefix, other.keyPrefix) && eq(timeUnit, other.timeUnit) && eq(timeout, other.timeout)
-        && eq(usingAsyncGet, other.usingAsyncGet);
+        && eq(usingAsyncGet, other.usingAsyncGet) && eq(usingSASL, other.usingSASL) && eq(username, other.username)
+        && eq(password, other.password);
   }
 
   /**
@@ -256,8 +317,9 @@ private static <O> boolean eq(O o1, O o2) {
   @Override
   public String toString() {
     return format(
-        "MemcachedConfiguration [addresses=%s, compressionEnabled=%s, connectionFactory=%s, , expiration=%s, keyPrefix=%s, timeUnit=%s, timeout=%s, usingAsyncGet=%s]",
-        addresses, compressionEnabled, connectionFactory, expiration, keyPrefix, timeUnit, timeout, usingAsyncGet);
+        "MemcachedConfiguration [addresses=%s, compressionEnabled=%s, connectionFactory=%s, , expiration=%s, keyPrefix=%s, timeUnit=%s, timeout=%s, usingAsyncGet=%s, usingSASL=%s, username=%s, password=%s]",
+        addresses, compressionEnabled, connectionFactory, expiration, keyPrefix, timeUnit, timeout, usingAsyncGet,
+        usingSASL, username, password);
   }
 
 }

src/main/java/org/mybatis/caches/memcached/MemcachedConfigurationBuilder.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2012-2018 the original author or authors.
+ *    Copyright 2012-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -54,6 +54,8 @@ private MemcachedConfigurationBuilder() {
     memcachedPropertiesFilename = System.getProperty(SYSTEM_PROPERTY_MEMCACHED_PROPERTIES_FILENAME, MEMCACHED_RESOURCE);
 
     settersRegistry.add(new StringPropertySetter("org.mybatis.caches.memcached.keyprefix", "keyPrefix", "_mybatis_"));
+    settersRegistry.add(new StringPropertySetter("org.mybatis.caches.memcached.username", "username", ""));
+    settersRegistry.add(new StringPropertySetter("org.mybatis.caches.memcached.password", "password", ""));
 
     settersRegistry
         .add(new IntegerPropertySetter("org.mybatis.caches.memcached.expiration", "expiration", 60 * 60 * 24 * 30));
@@ -63,6 +65,7 @@ private MemcachedConfigurationBuilder() {
     settersRegistry.add(new BooleanPropertySetter("org.mybatis.caches.memcached.asyncget", "usingAsyncGet", false));
     settersRegistry
         .add(new BooleanPropertySetter("org.mybatis.caches.memcached.compression", "compressionEnabled", false));
+    settersRegistry.add(new BooleanPropertySetter("org.mybatis.caches.memcached.sasl", "usingSASL", false));
 
     settersRegistry.add(new InetSocketAddressListPropertySetter());
     settersRegistry.add(new ConnectionFactorySetter());

src/site/site.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2012-2016 the original author or authors.
+       Copyright 2012-2019 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.