CLOUDSTACK-5241: Remove Rot13 cipher

Sheng Yang · Sheng Yang · commit feeafa76a406 · 2014-12-03T19:30:31.000-08:00
diff --git a/server/src/com/cloud/network/element/CloudZonesNetworkElement.java b/server/src/com/cloud/network/element/CloudZonesNetworkElement.java
@@ -50,7 +50,6 @@
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.service.dao.ServiceOfferingDao;
-import com.cloud.utils.PasswordGenerator;
 import com.cloud.utils.component.AdapterBase;
 import com.cloud.vm.NicProfile;
 import com.cloud.vm.ReservationContext;
@@ -215,8 +214,7 @@ public boolean addPasswordAndUserdata(Network network, NicProfile nic, VirtualMa
 
             Commands cmds = new Commands(Command.OnError.Continue);
             if (password != null && nic.isDefaultNic()) {
-                final String encodedPassword = PasswordGenerator.rot13(password);
-                SavePasswordCommand cmd = new SavePasswordCommand(encodedPassword, nic.getIp4Address(), uservm.getHostName(), _networkMgr.getExecuteInSeqNtwkElmtCmd());
+                SavePasswordCommand cmd = new SavePasswordCommand(password, nic.getIp4Address(), uservm.getHostName(), _networkMgr.getExecuteInSeqNtwkElmtCmd());
                 cmds.addCommand("password", cmd);
             }
             String serviceOffering = _serviceOfferingDao.findByIdIncludingRemoved(uservm.getServiceOfferingId()).getDisplayText();
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -200,7 +200,6 @@
 import com.cloud.uservm.UserVm;
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.Pair;
-import com.cloud.utils.PasswordGenerator;
 import com.cloud.utils.StringUtils;
 import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.component.ManagerBase;
@@ -3642,9 +3641,8 @@ private void createPasswordCommand(final VirtualRouter router, final VirtualMach
 
         // password should be set only on default network element
         if (password != null && nic.isDefaultNic()) {
-            final String encodedPassword = PasswordGenerator.rot13(password);
             final SavePasswordCommand cmd =
-                    new SavePasswordCommand(encodedPassword, nic.getIp4Address(), profile.getVirtualMachine().getHostName(), _networkModel.getExecuteInSeqNtwkElmtCmd());
+                    new SavePasswordCommand(password, nic.getIp4Address(), profile.getVirtualMachine().getHostName(), _networkModel.getExecuteInSeqNtwkElmtCmd());
             cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId()));
             cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, getRouterIpInNetwork(nic.getNetworkId(), router.getId()));
             cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/savepassword.sh b/systemvm/patches/debian/config/opt/cloud/bin/savepassword.sh
@@ -40,9 +40,7 @@ do
   case $OPTION in
   v)	VM_IP="$OPTARG"
 		;;
-  p)	
-		ENCODEDPASSWORD="$OPTARG"
-		PASSWORD=$(echo $ENCODEDPASSWORD | tr '[a-m][n-z][A-M][N-Z]' '[n-z][a-m][N-Z][A-M]')
+  p)    PASSWORD="$OPTARG"
 		;;
   ?)	echo "Incorrect usage"
                 unlock_exit 1 $lock $locked
diff --git a/utils/src/com/cloud/utils/PasswordGenerator.java b/utils/src/com/cloud/utils/PasswordGenerator.java
@@ -77,22 +77,4 @@ public static String generatePresharedKey(int numChars) {
         return psk.toString();
 
     }
-
-    public static String rot13(final String password) {
-        final StringBuilder newPassword = new StringBuilder(password.length());
-
-        for (int i = 0; i < password.length(); i++) {
-            char c = password.charAt(i);
-
-            if ((c >= 'a' && c <= 'm') || ((c >= 'A' && c <= 'M'))) {
-                c += 13;
-            } else if ((c >= 'n' && c <= 'z') || (c >= 'N' && c <= 'Z')) {
-                c -= 13;
-            }
-
-            newPassword.append(c);
-        }
-
-        return newPassword.toString();
-    }
 }
diff --git a/utils/test/com/cloud/utils/PasswordGeneratorTest.java b/utils/test/com/cloud/utils/PasswordGeneratorTest.java
@@ -38,19 +38,4 @@ public void generateRandomPassword() {
         // and the third is a digit
         Assert.assertTrue(Character.isDigit(password.charAt(2)));
     }
-
-    @Test
-    public void rot13() {
-        // only letters are handled, numbers are unchanged
-        Assert.assertEquals("1234", PasswordGenerator.rot13("1234"));
-        // letters are moved by +-13 characters
-        Assert.assertEquals("nop", PasswordGenerator.rot13("abc"));
-        // the transformation it is reversable
-        Assert.assertEquals("abc", PasswordGenerator.rot13("nop"));
-        // which means for any string
-        Assert.assertEquals("abcdefghijklmnooprstuvxyzuv1234?", PasswordGenerator.rot13(PasswordGenerator.rot13("abcdefghijklmnooprstuvxyzuv1234?")));
-        // same for capital letters
-        Assert.assertEquals("ABC", PasswordGenerator.rot13("NOP"));
-        Assert.assertEquals("NOP", PasswordGenerator.rot13("ABC"));
-    }
 }
