[Pkg-voip-commits] [SCM] reSIProcate branch, master, updated. upstream/1.8.0_pre1-69-gaae8988

Daniel Pocock daniel at pocock.com.au
Wed May 23 18:53:09 UTC 2012


The following commit has been merged in the master branch:
commit d7fa8009d490d2f528d7f0d56c64d73f0cc290ab
Author: Daniel Pocock <daniel at pocock.com.au>
Date:   Wed May 23 18:52:32 2012 +0000

    Imported Upstream version 1.8.0

diff --git a/repro/README_MySQL.txt b/repro/README_MySQL.txt
index faad83a..e5690e1 100644
--- a/repro/README_MySQL.txt
+++ b/repro/README_MySQL.txt
@@ -35,3 +35,33 @@ mysqlaccess -U root -P <pwd> \* \* repro --brief
 
 Can make sure all is flushed with 
 mysqladmin -u root -p refresh
+
+
+passwordHashAlt
+===============
+
+The schema contains a passwordHashAlt column
+
+This is much the same as the ha1b column used by Kamailio
+
+  passwordHash =    h(A1) = md5(user:realm:password)
+
+  passwordHashAlt = h(A1) = md5(user at domain:realm:password)
+
+repro will update the value in this column each time a user is added
+or their password is changed.  However, it is not currently consulted
+as part of the authentication process.
+
+To explicitly use this column instead of the regular passwordHash
+column, use this custom auth query:
+
+MySQLCustomUserAuthQuery = \
+   SELECT passwordHashAlt
+   FROM users
+   WHERE user = '$user'
+     AND concat(domain, '@', domain) = '$domain'
+
+A future version of repro will be able to use both columns during
+the authentication process, to concurrently support UAs using
+either authentication style.
+
diff --git a/repro/create_mysql_reprodb.sql b/repro/create_mysql_reprodb.sql
index 75df053..daac286 100644
--- a/repro/create_mysql_reprodb.sql
+++ b/repro/create_mysql_reprodb.sql
@@ -3,12 +3,20 @@ CREATE DATABASE repro;
 
 USE repro;
 
+-- Uncomment the following to have all tables re-created
+-- DROP TABLE IF EXISTS `users`;
+-- DROP TABLE IF EXISTS `routesavp`;
+-- DROP TABLE IF EXISTS `aclsavp`;
+-- DROP TABLE IF EXISTS `configsavp`;
+-- DROP TABLE IF EXISTS `staticregsavp`;
+-- DROP TABLE IF EXISTS `filtersavp`;
+-- DROP TABLE IF EXISTS `siloavp`;
+
+
 --
 -- Table structure for table `users`
 --
-
-DROP TABLE IF EXISTS `users`;
-CREATE TABLE `users` (
+CREATE TABLE IF NOT EXISTS `users` (
   `id` INT PRIMARY KEY AUTO_INCREMENT,
   `user` VARCHAR(64) NOT NULL,
   `domain` VARCHAR(253),
@@ -21,13 +29,20 @@ CREATE TABLE `users` (
   CONSTRAINT c_user_domain UNIQUE INDEX idx_user_domain (`user`, `domain`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+-- Upgrade from version 2 schema to version 3
+ALTER TABLE `users` 
+   ADD COLUMN `id` INT NULL AUTO_INCREMENT  FIRST , 
+   ADD COLUMN `passwordHashAlt` VARCHAR(32) NULL DEFAULT NULL  AFTER `passwordHash` , 
+   CHANGE COLUMN `domain` `domain` VARCHAR(253) NULL DEFAULT NULL  
+, DROP PRIMARY KEY 
+, ADD PRIMARY KEY (`id`) 
+, ADD UNIQUE INDEX `idx_user_domain` (`user` ASC, `domain` ASC) ;
 
 --
 -- Table structure for table `routesavp`
 --
 
-DROP TABLE IF EXISTS `routesavp`;
-CREATE TABLE `routesavp` (
+CREATE TABLE IF NOT EXISTS `routesavp` (
   `attr` VARCHAR(255) NOT NULL,
   `value` VARCHAR(4096),
   PRIMARY KEY (`attr`) 
@@ -37,8 +52,7 @@ CREATE TABLE `routesavp` (
 -- Table structure for table `aclsavp`
 --
 
-DROP TABLE IF EXISTS `aclsavp`;
-CREATE TABLE `aclsavp` (
+CREATE TABLE IF NOT EXISTS `aclsavp` (
   `attr` VARCHAR(255) NOT NULL,
   `value` VARCHAR(4096),
   PRIMARY KEY (`attr`) 
@@ -48,8 +62,7 @@ CREATE TABLE `aclsavp` (
 -- Table structure for table `configsavp`
 --
 
-DROP TABLE IF EXISTS `configsavp`;
-CREATE TABLE `configsavp` (
+CREATE TABLE IF NOT EXISTS `configsavp` (
   `attr` VARCHAR(255) NOT NULL,
   `value` VARCHAR(4096),
   PRIMARY KEY (`attr`) 
@@ -59,8 +72,7 @@ CREATE TABLE `configsavp` (
 -- Table structure for table `staticregsavp`
 --
 
-DROP TABLE IF EXISTS `staticregsavp`;
-CREATE TABLE `staticregsavp` (
+CREATE TABLE IF NOT EXISTS `staticregsavp` (
   `attr` VARCHAR(255) NOT NULL,
   `value` VARCHAR(4096),
   PRIMARY KEY (`attr`) 
@@ -70,8 +82,7 @@ CREATE TABLE `staticregsavp` (
 -- Table structure for table `filtersavp`
 --
 
-DROP TABLE IF EXISTS `filtersavp`;
-CREATE TABLE `filtersavp` (
+CREATE TABLE IF NOT EXISTS `filtersavp` (
   `attr` VARCHAR(255) NOT NULL,
   `value` VARCHAR(4096),
   PRIMARY KEY (`attr`) 
@@ -82,8 +93,7 @@ CREATE TABLE `filtersavp` (
 -- Note:  This table contains 2 indexes
 --
 
-DROP TABLE IF EXISTS `siloavp`;
-CREATE TABLE `siloavp` (
+CREATE TABLE IF NOT EXISTS `siloavp` (
   `attr` VARCHAR(255) NOT NULL,
   `attr2` VARCHAR(255) NOT NULL,
   `value` VARCHAR(20315),
diff --git a/resip/stack/HeaderHash.cxx b/resip/stack/HeaderHash.cxx
index 8c2dfbb..b3e2e1d 100644
--- a/resip/stack/HeaderHash.cxx
+++ b/resip/stack/HeaderHash.cxx
@@ -1,4 +1,4 @@
-/* C++ code produced by gperf version 3.0.4 */
+/* C++ code produced by gperf version 3.0.3 */
 /* Command-line: gperf -C -D -E -L C++ -t -k '*' --compare-strncmp --ignore-case -Z HeaderHash HeaderHash.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
diff --git a/resip/stack/MethodHash.cxx b/resip/stack/MethodHash.cxx
index 3006778..af30c92 100644
--- a/resip/stack/MethodHash.cxx
+++ b/resip/stack/MethodHash.cxx
@@ -1,4 +1,4 @@
-/* C++ code produced by gperf version 3.0.4 */
+/* C++ code produced by gperf version 3.0.3 */
 /* Command-line: gperf -C -D -E -L C++ -t -k '*' --compare-strncmp -Z MethodHash MethodHash.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \

-- 
reSIProcate



More information about the Pkg-voip-commits mailing list