shimingxy před 5 roky
rodič
revize
21e1d24e96
37 změnil soubory, kde provedl 36 přidání a 175 odebrání
  1. 0 140
      maxkey-core/src/test/java/com/connsec/radius/RadiusTest.java
  2. 1 1
      maxkey-core/src/test/java/org/maxkey/cache/CacheFactoryTest.java
  3. 1 1
      maxkey-core/src/test/java/org/maxkey/cache/RandomCache.java
  4. 1 1
      maxkey-core/src/test/java/org/maxkey/crypto/Base64UtilsTest.java
  5. 1 1
      maxkey-core/src/test/java/org/maxkey/crypto/DigestUtilsTest.java
  6. 1 1
      maxkey-core/src/test/java/org/maxkey/crypto/KeyGen.java
  7. 1 1
      maxkey-core/src/test/java/org/maxkey/crypto/Md5SumTest.java
  8. 1 1
      maxkey-core/src/test/java/org/maxkey/crypto/PasswordGenTest.java
  9. 1 1
      maxkey-core/src/test/java/org/maxkey/crypto/RSAUtilsTest.java
  10. 1 1
      maxkey-core/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java
  11. 1 1
      maxkey-core/src/test/java/org/maxkey/crypto/RsaMessage.java
  12. 1 1
      maxkey-core/src/test/java/org/maxkey/crypto/SCryptPasswordEncoderTest.java
  13. 1 1
      maxkey-core/src/test/java/org/maxkey/crypto/cert/X509CertUtilsTest.java
  14. 1 1
      maxkey-core/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java
  15. 1 1
      maxkey-core/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java
  16. 1 1
      maxkey-core/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java
  17. 1 1
      maxkey-core/src/test/java/org/maxkey/json/util/JsonUtilsTest.java
  18. 1 1
      maxkey-core/src/test/java/org/maxkey/mail/MailTest.java
  19. 1 1
      maxkey-core/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java
  20. 1 1
      maxkey-core/src/test/java/org/maxkey/otp/algorithm/KeyUriFormatTest.java
  21. 1 1
      maxkey-core/src/test/java/org/maxkey/otp/algorithm/RQcodeTest.java
  22. 1 1
      maxkey-core/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java
  23. 1 0
      maxkey-core/src/test/java/org/maxkey/package-info.java
  24. 1 1
      maxkey-core/src/test/java/org/maxkey/persistence/derby/DerbyTest.java
  25. 1 1
      maxkey-core/src/test/java/org/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java
  26. 1 1
      maxkey-core/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java
  27. 1 1
      maxkey-core/src/test/java/org/maxkey/util/DateUtilsTest.java
  28. 1 1
      maxkey-core/src/test/java/org/maxkey/util/EthernetAddressTest.java
  29. 1 1
      maxkey-core/src/test/java/org/maxkey/util/IdSequenceTest.java
  30. 1 1
      maxkey-core/src/test/java/org/maxkey/util/MacAddressTest.java
  31. 1 1
      maxkey-core/src/test/java/org/maxkey/util/ObjectTransformerTest.java
  32. 1 1
      maxkey-core/src/test/java/org/maxkey/util/PathUtilsTest.java
  33. 1 1
      maxkey-core/src/test/java/org/maxkey/util/SqlPrettyTest.java
  34. 1 1
      maxkey-core/src/test/java/org/maxkey/util/StringGeneratorTest.java
  35. 1 1
      maxkey-core/src/test/java/org/maxkey/util/UUIDGeneratorTest.java
  36. 1 1
      maxkey-core/src/test/java/org/maxkey/word/CharacterCase.java
  37. 1 1
      maxkey-core/src/test/java/org/maxkey/word/SubStr.java

+ 0 - 140
maxkey-core/src/test/java/com/connsec/radius/RadiusTest.java

@@ -1,140 +0,0 @@
-/**
- * 
- */
-package com.connsec.radius;
-
-import java.io.IOException;
-import java.net.InetAddress;
-
-import net.jradius.client.RadiusClient;
-import net.jradius.client.auth.MSCHAPv2Authenticator;
-import net.jradius.client.auth.RadiusAuthenticator;
-import net.jradius.dictionary.Attr_AcctInputOctets;
-import net.jradius.dictionary.Attr_AcctOutputOctets;
-import net.jradius.dictionary.Attr_AcctSessionId;
-import net.jradius.dictionary.Attr_AcctSessionTime;
-import net.jradius.dictionary.Attr_AcctStatusType;
-import net.jradius.dictionary.Attr_AcctTerminateCause;
-import net.jradius.dictionary.Attr_NASPort;
-import net.jradius.dictionary.Attr_NASPortType;
-import net.jradius.dictionary.Attr_ReplyMessage;
-import net.jradius.dictionary.Attr_UserName;
-import net.jradius.dictionary.Attr_UserPassword;
-import net.jradius.exception.RadiusException;
-import net.jradius.exception.UnknownAttributeException;
-import net.jradius.packet.AccessAccept;
-import net.jradius.packet.AccessRequest;
-import net.jradius.packet.AccountingRequest;
-import net.jradius.packet.RadiusPacket;
-import net.jradius.packet.attribute.AttributeFactory;
-import net.jradius.packet.attribute.AttributeList;
-import net.jradius.util.RadiusRandom;
-
-/**
- * @author Crystal.Sea
- *
- */
-public class RadiusTest {
-
-	/**
-	 * @param args
-	 * @throws IOException 
-	 * @throws RadiusException 
-	 * @throws UnknownAttributeException 
-	 */
-	public static void main(String[] args) {
-		// TODO Auto-generated method stub
-		 AttributeFactory.loadAttributeDictionary("net.jradius.dictionary.AttributeDictionaryImpl");
-		 
-		 try{
-			 InetAddress inetAddress=InetAddress.getByName("127.0.0.1");
-			 String sharedSecret="testing123";
-			 RadiusClient radiusClient = new RadiusClient(
-	                 inetAddress,   // InetAddress - Address of remote RADIUS Server
-	                 sharedSecret,
-	                 1812,
-	                 1813,
-	                 60); // String - Shared Secret for remote RADIUS Server
-			 
-			 System.out.println("RADIUS response from {}: {}"+radiusClient.getRemoteInetAddress().getCanonicalHostName());
-			 	AttributeList attributeList = new AttributeList();
-			   
-			   
-			    //attributeList.add(new Attr_NASPortType(Attr_NASPortType.Wireless80211));
-			    attributeList.add(new Attr_NASPort(new Long(-1)));
-			    attributeList.add(new Attr_UserName("lameuser"));
-			    attributeList.add(new Attr_UserPassword("tttt"));
-			    
-			    AccessRequest request = new AccessRequest(radiusClient, attributeList);
-			   
-			    System.out.println("Sending:\n" + request.toString());
-			 
-			   // RadiusAuthenticator auth =new MSCHAPv2Authenticator();
-			    RadiusAuthenticator auth = RadiusClient.getAuthProtocol("eap2");
-			    
-			    RadiusPacket reply = radiusClient.authenticate(request,auth ,3);
-			    
-			    System.out.println("RADIUS response from {}: {}"+radiusClient.getRemoteInetAddress().getCanonicalHostName()+","+reply.getClass().getName());
-			 
-			    if (reply == null) return; // Request Timed-out
-			    
-			    
-			     System.out.println("getIdentifier:" + reply.getIdentifier());
-			     System.out.println("getcode:" + reply.getCode());
-			     
-			    
-			 
-			       System.out.println("getAttributeList:\n" + reply.getAttributes().getAttributeList());
-			    System.out.println("Received:\n" + reply.toString());
-			    
-			    boolean isAuthenticated = (reply instanceof AccessAccept);
-			    
-			    System.out.println("isAuthenticated : \n" + isAuthenticated);
-			    
-			    System.out.println("AccessReject : \n" + (reply instanceof net.jradius.packet.AccessReject));
-			    
-			    System.out.println("PasswordReject : \n" + (reply instanceof net.jradius.packet.PasswordReject));
-			   
-			    String replyMessage = (String) reply.getAttributeValue(Attr_ReplyMessage.TYPE);
-			 
-			    if (replyMessage != null)
-			    {
-			        System.out.println("Reply Message: " + replyMessage);
-			    }else{
-			    	System.out.println("Reply Message: " + "error . ");
-			    }
-			    
-			    /*
-			    attributeList.add(new Attr_AcctSessionId(RadiusRandom.getRandomString(24)));
-			    
-			    request = new AccountingRequest(radiusClient, attributeList);
-			    request.addAttribute(new Attr_AcctStatusType(Attr_AcctStatusType.Start));
-			 
-			    reply = radiusClient.accounting(request, 5);
-			    
-			    
-			    request = new AccountingRequest(radiusClient, attributeList);
-			    request.addAttribute(new Attr_AcctStatusType(Attr_AcctStatusType.Stop));
-			    request.addAttribute(new Attr_AcctInputOctets(new Long(10)));
-			    request.addAttribute(new Attr_AcctOutputOctets(new Long(10)));
-			    request.addAttribute(new Attr_AcctSessionTime(new Long(60)));
-			    request.addAttribute(new Attr_AcctTerminateCause(Attr_AcctTerminateCause.UserRequest));
-			 
-			    reply = radiusClient.accounting(request, 5);*/
-		 }catch(Exception e){
-			 e.printStackTrace();
-		 }
-		    
-		    
-
-	}
-
-	 //��InetAddress �е���Ϣ��ʾ����   
-    public static void showInfo(InetAddress IP){   
-        String name = IP.getHostName();   
-        String address = IP.getHostAddress();   
-        System.out.println(name);   
-        System.out.println(address);   
-        System.out.println("------------------------------");   
-    }   
-}

+ 1 - 1
maxkey-core/src/test/java/com/connsec/cache/CacheFactoryTest.java → maxkey-core/src/test/java/org/maxkey/cache/CacheFactoryTest.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.connsec.cache;
+package org.maxkey.cache;
 
 import java.util.ArrayList;
 

+ 1 - 1
maxkey-core/src/test/java/com/connsec/cache/RandomCache.java → maxkey-core/src/test/java/org/maxkey/cache/RandomCache.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.connsec.cache;
+package org.maxkey.cache;
 
 import java.util.Random;
 

+ 1 - 1
maxkey-core/src/test/java/com/connsec/crypto/Base64UtilsTest.java → maxkey-core/src/test/java/org/maxkey/crypto/Base64UtilsTest.java

@@ -1,4 +1,4 @@
-package com.connsec.crypto;
+package org.maxkey.crypto;
 
 import org.junit.Test;
 import org.maxkey.crypto.Base64Utils;

+ 1 - 1
maxkey-core/src/test/java/com/connsec/crypto/DigestUtilsTest.java → maxkey-core/src/test/java/org/maxkey/crypto/DigestUtilsTest.java

@@ -1,4 +1,4 @@
-package com.connsec.crypto;
+package org.maxkey.crypto;
 
 import java.util.Date;
 

+ 1 - 1
maxkey-core/src/test/java/com/connsec/crypto/KeyGen.java → maxkey-core/src/test/java/org/maxkey/crypto/KeyGen.java

@@ -1,4 +1,4 @@
-package com.connsec.crypto;
+package org.maxkey.crypto;
 import java.io.FileOutputStream;
 import java.io.ObjectOutputStream;
 import java.security.KeyPair;

+ 1 - 1
maxkey-core/src/test/java/com/connsec/crypto/Md5SumTest.java → maxkey-core/src/test/java/org/maxkey/crypto/Md5SumTest.java

@@ -1,4 +1,4 @@
-package com.connsec.crypto;
+package org.maxkey.crypto;
 
 import java.io.File;
 import java.io.FileNotFoundException;

+ 1 - 1
maxkey-core/src/test/java/com/connsec/crypto/PasswordGenTest.java → maxkey-core/src/test/java/org/maxkey/crypto/PasswordGenTest.java

@@ -1,4 +1,4 @@
-package com.connsec.crypto;
+package org.maxkey.crypto;
 
 import org.maxkey.crypto.password.PasswordGen;
 

+ 1 - 1
maxkey-core/src/test/java/com/connsec/crypto/RSAUtilsTest.java → maxkey-core/src/test/java/org/maxkey/crypto/RSAUtilsTest.java

@@ -1,4 +1,4 @@
-package com.connsec.crypto;
+package org.maxkey.crypto;
 
 import java.security.Key;
 import java.util.Map;

+ 1 - 1
maxkey-core/src/test/java/com/connsec/crypto/ReciprocalUtilsTest.java → maxkey-core/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java

@@ -1,4 +1,4 @@
-package com.connsec.crypto;
+package org.maxkey.crypto;
 
 import java.io.UnsupportedEncodingException;
 

+ 1 - 1
maxkey-core/src/test/java/com/connsec/crypto/RsaMessage.java → maxkey-core/src/test/java/org/maxkey/crypto/RsaMessage.java

@@ -1,4 +1,4 @@
-package com.connsec.crypto;
+package org.maxkey.crypto;
 	import java.io.FileInputStream;
 	import java.io.ObjectInputStream;
 	import java.security.Key;

+ 1 - 1
maxkey-core/src/test/java/com/connsec/crypto/SCryptPasswordEncoderTest.java → maxkey-core/src/test/java/org/maxkey/crypto/SCryptPasswordEncoderTest.java

@@ -1,4 +1,4 @@
-package com.connsec.crypto;
+package org.maxkey.crypto;
 
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 

+ 1 - 1
maxkey-core/src/test/java/com/connsec/crypto/cert/X509CertUtilsTest.java → maxkey-core/src/test/java/org/maxkey/crypto/cert/X509CertUtilsTest.java

@@ -1,4 +1,4 @@
-package com.connsec.crypto.cert;
+package org.maxkey.crypto.cert;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;

+ 1 - 1
maxkey-core/src/test/java/com/connsec/crypto/cert/X509V3CertGenTest.java → maxkey-core/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java

@@ -1,4 +1,4 @@
-package com.connsec.crypto.cert;
+package org.maxkey.crypto.cert;
 
 import java.io.FileOutputStream;
 import java.security.KeyPair;

+ 1 - 1
maxkey-core/src/test/java/com/connsec/crypto/signature/DsaSignerTest.java → maxkey-core/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java

@@ -1,4 +1,4 @@
-package com.connsec.crypto.signature;
+package org.maxkey.crypto.signature;
 
 import java.util.Map;
 

+ 1 - 1
maxkey-core/src/test/java/com/connsec/crypto/signature/RsaSignerTest.java → maxkey-core/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.connsec.crypto.signature;
+package org.maxkey.crypto.signature;
 
 import java.util.Map;
 

+ 1 - 1
maxkey-core/src/test/java/com/connsec/json/util/JsonUtilsTest.java → maxkey-core/src/test/java/org/maxkey/json/util/JsonUtilsTest.java

@@ -1,4 +1,4 @@
-package com.connsec.json.util;
+package org.maxkey.json.util;
 
 import org.maxkey.domain.Groups;
 import org.maxkey.pretty.impl.JsonPretty;

+ 1 - 1
maxkey-core/src/test/java/com/connsec/mail/MailTest.java → maxkey-core/src/test/java/org/maxkey/mail/MailTest.java

@@ -1,4 +1,4 @@
-package com.connsec.mail;
+package org.maxkey.mail;
 
 import org.apache.commons.mail.DefaultAuthenticator;
 import org.apache.commons.mail.Email;

+ 1 - 1
maxkey-core/src/test/java/com/connsec/otp/algorithm/HmacOTPTest.java → maxkey-core/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java

@@ -1,4 +1,4 @@
-package com.connsec.otp.algorithm;
+package org.maxkey.otp.algorithm;
 
 
 import java.security.InvalidKeyException;

+ 1 - 1
maxkey-core/src/test/java/com/connsec/otp/algorithm/KeyUriFormatTest.java → maxkey-core/src/test/java/org/maxkey/otp/algorithm/KeyUriFormatTest.java

@@ -1,4 +1,4 @@
-package com.connsec.otp.algorithm;
+package org.maxkey.otp.algorithm;
 
 import java.io.File;
 

+ 1 - 1
maxkey-core/src/test/java/com/connsec/otp/algorithm/RQcodeTest.java → maxkey-core/src/test/java/org/maxkey/otp/algorithm/RQcodeTest.java

@@ -1,4 +1,4 @@
-package com.connsec.otp.algorithm;
+package org.maxkey.otp.algorithm;
 
 import java.io.File;
 

+ 1 - 1
maxkey-core/src/test/java/com/connsec/otp/algorithm/TimeBasedOTPTest.java → maxkey-core/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java

@@ -1,4 +1,4 @@
-package com.connsec.otp.algorithm;
+package org.maxkey.otp.algorithm;
 
 import java.text.DateFormat;
 import java.text.ParseException;

+ 1 - 0
maxkey-core/src/test/java/org/maxkey/package-info.java

@@ -0,0 +1 @@
+package org.maxkey;

+ 1 - 1
maxkey-core/src/test/java/com/connsec/persistence/derby/DerbyTest.java → maxkey-core/src/test/java/org/maxkey/persistence/derby/DerbyTest.java

@@ -1,4 +1,4 @@
-package com.connsec.persistence.derby;
+package org.maxkey.persistence.derby;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;

+ 1 - 1
maxkey-core/src/test/java/com/connsec/persistence/ldap/ActiveDirectoryUtilsTest.java → maxkey-core/src/test/java/org/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java

@@ -1,4 +1,4 @@
-package com.connsec.persistence.ldap;
+package org.maxkey.persistence.ldap;
 
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;

+ 1 - 1
maxkey-core/src/test/java/com/connsec/rest/AuthorizationHeaderTest.java → maxkey-core/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java

@@ -1,4 +1,4 @@
-package com.connsec.rest;
+package org.maxkey.rest;
 
 import org.junit.Test;
 import org.maxkey.util.AuthorizationHeaderUtils;

+ 1 - 1
maxkey-core/src/test/java/com/connsec/util/DateUtilsTest.java → maxkey-core/src/test/java/org/maxkey/util/DateUtilsTest.java

@@ -1,4 +1,4 @@
-package com.connsec.util;
+package org.maxkey.util;
 
 import java.util.Date;
 

+ 1 - 1
maxkey-core/src/test/java/com/connsec/util/EthernetAddressTest.java → maxkey-core/src/test/java/org/maxkey/util/EthernetAddressTest.java

@@ -1,4 +1,4 @@
-package com.connsec.util;
+package org.maxkey.util;
 
 import org.maxkey.util.EthernetAddress;
 

+ 1 - 1
maxkey-core/src/test/java/com/connsec/util/IdSequenceTest.java → maxkey-core/src/test/java/org/maxkey/util/IdSequenceTest.java

@@ -1,4 +1,4 @@
-package com.connsec.util;
+package org.maxkey.util;
 
 public class IdSequenceTest {
 

+ 1 - 1
maxkey-core/src/test/java/com/connsec/util/MacAddressTest.java → maxkey-core/src/test/java/org/maxkey/util/MacAddressTest.java

@@ -1,4 +1,4 @@
-package com.connsec.util;
+package org.maxkey.util;
 
 import org.maxkey.util.MacAddress;
 

+ 1 - 1
maxkey-core/src/test/java/com/connsec/util/ObjectTransformerTest.java → maxkey-core/src/test/java/org/maxkey/util/ObjectTransformerTest.java

@@ -1,4 +1,4 @@
-package com.connsec.util;
+package org.maxkey.util;
 
 import org.maxkey.domain.UserInfo;
 import org.maxkey.util.ObjectTransformer;

+ 1 - 1
maxkey-core/src/test/java/com/connsec/util/PathUtilsTest.java → maxkey-core/src/test/java/org/maxkey/util/PathUtilsTest.java

@@ -1,4 +1,4 @@
-package com.connsec.util;
+package org.maxkey.util;
 
 import org.junit.Test;
 import org.maxkey.util.PathUtils;

+ 1 - 1
maxkey-core/src/test/java/com/connsec/util/SqlPrettyTest.java → maxkey-core/src/test/java/org/maxkey/util/SqlPrettyTest.java

@@ -1,4 +1,4 @@
-package com.connsec.util;
+package org.maxkey.util;
 
 import org.maxkey.pretty.impl.SqlPretty;
 

+ 1 - 1
maxkey-core/src/test/java/com/connsec/util/StringGeneratorTest.java → maxkey-core/src/test/java/org/maxkey/util/StringGeneratorTest.java

@@ -1,4 +1,4 @@
-package com.connsec.util;
+package org.maxkey.util;
 
 import java.util.UUID;
 

+ 1 - 1
maxkey-core/src/test/java/com/connsec/util/UUIDGeneratorTest.java → maxkey-core/src/test/java/org/maxkey/util/UUIDGeneratorTest.java

@@ -1,4 +1,4 @@
-package com.connsec.util;
+package org.maxkey.util;
 
 import java.util.Date;
 //import java.util.UUID;

+ 1 - 1
maxkey-core/src/test/java/com/connsec/word/CharacterCase.java → maxkey-core/src/test/java/org/maxkey/word/CharacterCase.java

@@ -1,4 +1,4 @@
-package com.connsec.word;
+package org.maxkey.word;
 
 public class CharacterCase {
 

+ 1 - 1
maxkey-core/src/test/java/com/connsec/word/SubStr.java → maxkey-core/src/test/java/org/maxkey/word/SubStr.java

@@ -1,4 +1,4 @@
-package com.connsec.word;
+package org.maxkey.word;
 
 public class SubStr {