You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2026/03/13 17:53:23 UTC
(openmeetings) branch master updated: [OPENMEETINGS-2810] SIP seems to work as expected with Asterisk 22.x
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new f553ddd9c [OPENMEETINGS-2810] SIP seems to work as expected with Asterisk 22.x
f553ddd9c is described below
commit f553ddd9c45a0eb5d140e6c60de0abe0b260b79d
Author: Maxim Solodovnik <so...@apache.org>
AuthorDate: Sat Mar 14 00:53:11 2026 +0700
[OPENMEETINGS-2810] SIP seems to work as expected with Asterisk 22.x
---
.../apache/openmeetings/core/sip/SipManager.java | 15 +-
openmeetings-db/src/main/java/module-info.java | 1 +
.../openmeetings/db/dao/user/IUserManager.java | 3 +-
.../apache/openmeetings/db/dao/user/UserDao.java | 26 +-
.../db/entity/user/AsteriskSipUser.java | 283 +++++----------------
.../apache/openmeetings/db/entity/user/User.java | 13 +-
.../db/entity/file/AsteriskSipUserTest.java} | 27 +-
.../apache/openmeetings/backup/BackupImport.java | 18 +-
.../src/site/markdown/AsteriskIntegration.md | 133 +++++-----
.../org/apache/openmeetings/util/ImportHelper.java | 22 ++
.../openmeetings/util/OpenmeetingsVariables.java | 18 ++
.../openmeetings/web/admin/rooms/RoomsPanel.html | 2 +-
.../apache/openmeetings/web/app/UserManager.java | 6 +-
.../openmeetings/web/pages/auth/SignInPage.java | 3 +-
.../webapp/WEB-INF/classes/openmeetings.properties | 6 +
.../web/app/TestUserManagerMocked.java | 3 +-
.../openmeetings/web/backup/TestImportUser.java | 21 +-
.../openmeetings/backup/user/sip/organizations.xml | 44 ++++
.../apache/openmeetings/backup/user/sip/users.xml | 88 +++++++
.../openmeetings/webservice/UserWebService.java | 3 +-
20 files changed, 395 insertions(+), 340 deletions(-)
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
index ef1a61d27..7c3881916 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
@@ -32,6 +32,7 @@ import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.manager.ISipManager;
import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.wicket.util.string.Strings;
import org.asteriskjava.manager.DefaultManagerConnection;
import org.asteriskjava.manager.ManagerConnection;
@@ -93,7 +94,7 @@ public class SipManager implements ISipManager {
private BitSet ports;
@PostConstruct
- public void init() {
+ private void init() {
if (!Strings.isEmpty(sipHostname)) {
factory = new ManagerConnectionFactory(
sipHostname
@@ -105,12 +106,22 @@ public class SipManager implements ISipManager {
}
@PreDestroy
- public void destroy() {
+ private void destroy() {
if (con != null) {
con.logoff();
}
}
+ @Value("${sip.max.contacts:1}")
+ private void setSipMaxContacts(int max) {
+ OpenmeetingsVariables.setDefaultSipMaxContacts(max);
+ }
+
+ @Value("${sip.transport:transport-udp}")
+ private void setSipTransport(String transport) {
+ OpenmeetingsVariables.setDefaultSipTransport(transport);
+ }
+
private void connectManager() throws Exception {
if (con == null || ManagerConnectionState.CONNECTED != con.getState()) {
DefaultManagerConnection defCon = (DefaultManagerConnection)factory.createManagerConnection();
diff --git a/openmeetings-db/src/main/java/module-info.java b/openmeetings-db/src/main/java/module-info.java
index 02e3d16df..4e1e43590 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -79,6 +79,7 @@ module org.apache.openmeetings.db {
requires jakarta.servlet;
requires jakarta.xml.bind;
+ requires org.bouncycastle.provider;
requires org.dom4j;
requires org.slf4j;
requires ical4j.core;
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
index 94d6aba16..a9a99e4ff 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.dao.user;
-import java.security.NoSuchAlgorithmException;
import java.util.Locale;
import org.apache.openmeetings.db.entity.user.User;
@@ -30,7 +29,7 @@ public interface IUserManager {
String firstname, String email, String country,
long languageId, String tzId);
- Object registerUser(User u, String password, String hash) throws OmException, NoSuchAlgorithmException;
+ Object registerUser(User u, String password, String hash) throws OmException;
Long getLanguage(Locale loc);
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
index 27bb3aee6..cc6f9665c 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
@@ -34,7 +34,6 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.getMinLoginLeng
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
-import java.security.NoSuchAlgorithmException;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Collection;
@@ -57,7 +56,6 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.openmeetings.db.dao.IGroupAdminDataProviderDao;
import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.db.entity.user.Address;
-import org.apache.openmeetings.db.entity.user.AsteriskSipUser;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
@@ -276,7 +274,7 @@ public class UserDao implements IGroupAdminDataProviderDao<User> {
}
//this method is required to be able to drop reset hash
- public User resetPassword(User u, String password) throws NoSuchAlgorithmException {
+ public User resetPassword(User u, String password) {
if (u != null) {
u.setResethash(null);
u = update(u, password, u.getId());
@@ -284,7 +282,7 @@ public class UserDao implements IGroupAdminDataProviderDao<User> {
return u;
}
- private User updatePassword(Long id, String pwd, Long updatedBy) throws NoSuchAlgorithmException {
+ private User updatePassword(Long id, String pwd, Long updatedBy) {
//OpenJPA is not allowing to set fields not being fetched before
User u = get(id, true);
u.updatePassword(pwd);
@@ -292,7 +290,7 @@ public class UserDao implements IGroupAdminDataProviderDao<User> {
}
// Why the password field is not set via the Model is because its FetchType is Lazy
- public User update(User user, String password, Long updatedBy) throws NoSuchAlgorithmException {
+ public User update(User user, String password, Long updatedBy) {
User u = update(user, updatedBy);
if (u != null && !Strings.isEmpty(password)) {
u = updatePassword(u.getId(), password, updatedBy);
@@ -354,7 +352,7 @@ public class UserDao implements IGroupAdminDataProviderDao<User> {
u.setActivatehash(null);
u.setResethash(null);
u.setDeleted(true);
- u.setSipUser(new AsteriskSipUser());
+ u.setSipUser(null);
u.setAddress(new Address());
u.setAge(LocalDate.now());
u.setExternalId(null);
@@ -368,11 +366,7 @@ public class UserDao implements IGroupAdminDataProviderDao<User> {
File pic = OmFileHelper.getUserProfilePicture(u.getId(), u.getPictureUri(), null);
u.setPictureUri(null);
ICrypt crypt = CryptProvider.get();
- try {
- u.updatePassword(crypt.randomPassword(25));
- } catch (NoSuchAlgorithmException e) {
- log.error("Unexpected exception while updating password");
- }
+ u.updatePassword(crypt.randomPassword(25));
update(u, userId);
// this should be last action, so file will be deleted in case there were no errors
if (pic != null) {
@@ -503,13 +497,9 @@ public class UserDao implements IGroupAdminDataProviderDao<User> {
}
if (crypt.fallback(password, hash)) {
log.warn("Password for user with ID {} crypted with outdated Crypt, updating ...", userId);
- try {
- User u = updatePassword(userId, password, userId);
- log.warn("Password for user {} updated successfully", u);
- return true;
- } catch (NoSuchAlgorithmException e) {
- log.error("Unexpected exception while updating password");
- }
+ User u = updatePassword(userId, password, userId);
+ log.warn("Password for user {} updated successfully", u);
+ return true;
}
return false;
}
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
index 30267895d..011021daa 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
@@ -18,270 +18,111 @@
*/
package org.apache.openmeetings.db.entity.user;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
import java.io.Serializable;
+import java.util.HexFormat;
+
+import org.apache.openmeetings.util.OpenmeetingsVariables;
+import org.bouncycastle.crypto.digests.SHA256Digest;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
+import jakarta.persistence.PrimaryKeyJoinColumn;
+import jakarta.persistence.SecondaryTable;
+import jakarta.persistence.SecondaryTables;
import jakarta.persistence.Table;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.openmeetings.db.bind.adapter.IntAdapter;
-import org.apache.openmeetings.db.bind.adapter.LongAdapter;
@Entity
-@Table(name = "sipusers")
+@Table(name = "om_sipuser_auth")
+@SecondaryTables({
+ @SecondaryTable(name = "om_sipuser_aor", pkJoinColumns = @PrimaryKeyJoinColumn(name = "id")),
+ @SecondaryTable(name = "om_sipuser_endpoint", pkJoinColumns = @PrimaryKeyJoinColumn(name = "id"))
+})
@XmlRootElement(name = "asterisksipuser")
@XmlAccessorType(XmlAccessType.FIELD)
public class AsteriskSipUser implements Serializable {
private static final long serialVersionUID = 1L;
+ private static final int HASH_LEN = 256;
+ private static final String HASH_ALG = "SHA-256";//This one seems to be less supported "SHA-512-256";
- @XmlType(namespace = "org.apache.openmeetings.user.asterisk")
- public enum Type {
- friend, user, peer
- }
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "sip_db_id", unique = true, nullable = false)
+ @XmlElement(name = "id", required = true)
+ private long userId;
@Id
@Column(name = "id")
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- @XmlElement(name = "id", required = false)
- @XmlJavaTypeAdapter(value = LongAdapter.class, type = long.class)
- private long id;
-
- @Column(name = "type", nullable = false, length = 6)
- @Enumerated(EnumType.STRING)
- @XmlElement(name = "type", required = false)
- private Type type = Type.friend;
-
- @Column(name = "name", nullable = false, length = 128)
- @XmlElement(name = "name", required = false)
- private String name = ""; // Varchar 128
-
- @Column(name = "secret", length = 128)
- @XmlElement(name = "secret", required = false)
- private String secret; // Varchar 128
-
- @Column(name = "context", length = 128)
- @XmlElement(name = "context", required = false)
- private String context; // Varchar 128
-
- @Column(name = "host", nullable = false, length = 128)
- @XmlElement(name = "host", required = false)
- private String host = "dynamic"; // Varchar 128
-
- @Column(name = "ipaddr", nullable = false, length = 128)
- @XmlElement(name = "ipaddr", required = false)
- private String ipaddr = ""; // Varchar 128
+ private String id;
- @Column(name = "port", nullable = false, length = 8)
- @XmlElement(name = "port", required = false)
- @XmlJavaTypeAdapter(IntAdapter.class)
- private Integer port = 0; // mediumint(8)
+ @Column(name = "max_contacts", table = "om_sipuser_aor")
+ @XmlElement(name = "maxContacts", required = true, defaultValue = "1")
+ private int maxContacts = OpenmeetingsVariables.getDefaultSipMaxContacts();
- @Column(name = "regseconds", nullable = false)
- @XmlElement(name = "regseconds", required = false)
- @XmlJavaTypeAdapter(LongAdapter.class)
- private Long regseconds = 0L; // Bigint
+ @Column(name = "remove_existing", table = "om_sipuser_aor", nullable = false)
+ private String removeExisting = "yes";
- @Column(name = "defaultuser", nullable = true, length = 128)
- @XmlElement(name = "defaultuser", required = false)
- private String defaultuser; // Varchar 128
+ @Column(name = "auth_type")
+ private String authType = "digest";
- @Column(name = "fullcontact", length = 512)
- @XmlElement(name = "fullcontact", required = false)
- private String fullcontact;
+ @Column(name = "username")
+ private String username;
- @Column(name = "regserver", nullable = true, length = 128)
- @XmlElement(name = "regserver", required = false)
- private String regserver; // Varchar 128
+ @Column(name = "password_digest")
+ @XmlElement(name = "md5secret", required = true) // historical name to comply with old format
+ private String passwordDigest;
- @Column(name = "useragent", nullable = true, length = 128)
- @XmlElement(name = "useragent", required = false)
- private String useragent; // Varchar 128
+ @Column(name = "supported_algorithms_uac", nullable = false)
+ private String supportedAlgorithmsUac = HASH_ALG;
- @Column(name = "lastms")
- @XmlElement(name = "lastms", required = false)
- @XmlJavaTypeAdapter(IntAdapter.class)
- private Integer lastms; // Integer
+ @Column(name = "supported_algorithms_uas", nullable = false)
+ private String supportedAlgorithmsUas = HASH_ALG;
- @Column(name = "md5secret")
- @XmlElement(name = "md5secret", required = false)
- private String md5secret;
+ @Column(name = "aors", table = "om_sipuser_endpoint")
+ private String aors;
- @Column(name = "nat", nullable = false)
- @XmlElement(name = "nat", required = false)
- private String nat = "force_rport,comedia";
+ @Column(name = "auth", table = "om_sipuser_endpoint")
+ private String auth;
- @Column(name = "callbackextension", nullable = true, length = 250)
- @XmlElement(name = "callbackextension", required = false)
- private String callbackextension;
+ @Column(name = "context", table = "om_sipuser_endpoint")
+ @XmlElement(name = "context", required = false)
+ private String context; // Varchar 128
- @Column(name = "transport", nullable = false, length = 100)
- @XmlElement(name = "transport", required = false)
- private String transport = "wss,ws,udp";
+ @Column(name = "transport", nullable = false, table = "om_sipuser_endpoint")
+ @XmlElement(name = "transport", required = true, defaultValue = "transport-udp")
+ private String transport = OpenmeetingsVariables.getDefaultSipTransport();
- @Column(name = "allow", nullable = false, length = 100)
+ @Column(name = "allow", nullable = false, length = 100, table = "om_sipuser_endpoint")
@XmlElement(name = "allow", required = false)
private String allow = "!all,ulaw,opus,vp8";
- public long getId() {
- return id;
- }
+ @Column(name = "mailboxes", table = "om_sipuser_endpoint")
+ private String mailboxes;
- public void setId(long id) {
- this.id = id;
- }
-
- public Type getType() {
- return type;
- }
-
- public void setType(Type type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getSecret() {
- return secret;
- }
-
- public void setSecret(String secret) {
- this.secret = secret;
- }
-
- public String getContext() {
- return context;
+ public void setUsername(String username) {
+ this.id = username;
+ this.username = username;
+ this.aors = username;
+ this.auth = username;
}
public void setContext(String context) {
this.context = context;
}
- public String getHost() {
- return host;
- }
-
- public void setHost(String host) {
- this.host = host;
- }
-
- public String getIpaddr() {
- return ipaddr;
- }
-
- public void setIpaddr(String ipaddr) {
- this.ipaddr = ipaddr;
- }
-
- public Integer getPort() {
- return port;
- }
-
- public void setPort(Integer port) {
- this.port = port;
- }
-
- public Long getRegseconds() {
- return regseconds;
- }
-
- public void setRegseconds(Long regseconds) {
- this.regseconds = regseconds;
- }
-
- public String getDefaultuser() {
- return defaultuser;
- }
-
- public void setDefaultuser(String defaultuser) {
- this.defaultuser = defaultuser;
- }
-
- public String getFullcontact() {
- return fullcontact;
- }
-
- public void setFullcontact(String fullcontact) {
- this.fullcontact = fullcontact;
- }
-
- public String getRegserver() {
- return regserver;
- }
-
- public void setRegserver(String regserver) {
- this.regserver = regserver;
- }
-
- public String getUseragent() {
- return useragent;
- }
-
- public void setUseragent(String useragent) {
- this.useragent = useragent;
- }
-
- public Integer getLastms() {
- return lastms;
- }
-
- public void setLastms(Integer lastms) {
- this.lastms = lastms;
- }
-
- public String getMd5secret() {
- return md5secret;
- }
-
- public void setMd5secret(String md5secret) {
- this.md5secret = md5secret;
- }
-
- public String getNat() {
- return nat;
- }
-
- public void setNat(String nat) {
- this.nat = nat;
- }
-
- public String getCallbackextension() {
- return callbackextension;
- }
-
- public void setCallbackextension(String callbackextension) {
- this.callbackextension = callbackextension;
- }
-
- public String getAllow() {
- return allow;
- }
-
- public void setAllow(String allow) {
- this.allow = allow;
- }
-
- public String getTransport() {
- return transport;
- }
-
- public void setTransport(String transport) {
- this.transport = transport;
+ public void setPasswordDigest(String pass) {
+ SHA256Digest digest = new SHA256Digest();
+ byte[] bytes = pass.getBytes(UTF_8);
+ digest.update(bytes, 0, bytes.length);
+ byte[] enc = new byte[HASH_LEN / 8];
+ digest.doFinal(enc, 0);
+ this.passwordDigest = HASH_ALG + ":" + HexFormat.of().formatHex(enc);
}
}
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
index 220826e97..9121b31ca 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
@@ -25,7 +25,6 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.getSipContext;
import static org.apache.openmeetings.util.OpenmeetingsVariables.isSipEnabled;
import static org.apache.wicket.util.string.Strings.escapeMarkup;
-import java.security.NoSuchAlgorithmException;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
@@ -53,7 +52,6 @@ import jakarta.persistence.JoinColumn;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.OneToMany;
import jakarta.persistence.OneToOne;
-import jakarta.persistence.PrimaryKeyJoinColumn;
import jakarta.persistence.Table;
import jakarta.persistence.Transient;
import jakarta.xml.bind.annotation.XmlAccessType;
@@ -82,7 +80,6 @@ import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.db.entity.HistoricalEntity;
import org.apache.openmeetings.db.entity.label.OmLanguage;
import org.apache.openmeetings.db.entity.server.Sessiondata;
-import org.apache.openmeetings.db.util.MD5;
import org.apache.openmeetings.util.crypt.CryptProvider;
import org.apache.wicket.util.string.Strings;
@@ -358,7 +355,7 @@ public class User extends HistoricalEntity {
private List<GroupUser> groupUsers = new ArrayList<>();
@OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true)
- @PrimaryKeyJoinColumn(name="sip_user_id", referencedColumnName="id")
+ @JoinColumn(name = "sip_user_id", referencedColumnName = "sip_db_id")
@XmlElement(name = "sipUser", required = false)
private AsteriskSipUser sipUser;
@@ -506,18 +503,16 @@ public class User extends HistoricalEntity {
this.login = login;
}
- public void updatePassword(String pass) throws NoSuchAlgorithmException {
+ public void updatePassword(String pass) {
if (isSipEnabled()) {
AsteriskSipUser u = getSipUser();
if (u == null) {
setSipUser(u = new AsteriskSipUser());
}
String defaultRoomContext = getSipContext();
- u.setName(login);
- u.setDefaultuser(login);
- u.setMd5secret(MD5.checksum(login + ":asterisk:" + pass));
+ u.setUsername(login);
+ u.setPasswordDigest(login + ":asterisk:" + pass);
u.setContext(defaultRoomContext);
- u.setHost("dynamic");
} else {
setSipUser(null);
}
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/MD5.java b/openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/AsteriskSipUserTest.java
similarity index 51%
rename from openmeetings-db/src/main/java/org/apache/openmeetings/db/util/MD5.java
rename to openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/AsteriskSipUserTest.java
index cdb6135f1..506836a40 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/MD5.java
+++ b/openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/AsteriskSipUserTest.java
@@ -16,22 +16,25 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.db.util;
+package org.apache.openmeetings.db.entity.file;
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.apache.openmeetings.util.ImportHelper.getPrivateValue;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
+import org.apache.openmeetings.db.entity.user.AsteriskSipUser;
+import org.junit.jupiter.api.Test;
-import org.apache.commons.codec.binary.Hex;
+class AsteriskSipUserTest {
+ @Test
+ void testGetFileShouldReturnFirstSlideWithPDF() throws Exception {
+ AsteriskSipUser u = new AsteriskSipUser();
+ u.setPasswordDigest("bond:asterisk:12345");
-public class MD5 {
- private MD5() {}
+ String value = getPrivateValue(u, "passwordDigest", String.class);
- public static String checksum(String data) throws NoSuchAlgorithmException {
- MessageDigest md5 = MessageDigest.getInstance("MD5");
- byte[] b = data == null ? new byte[0] : data.getBytes(UTF_8);
- md5.update(b, 0, b.length);
- return Hex.encodeHexString(md5.digest());
+ assertEquals(
+ "SHA-256:c77920ac5aa487108de1ff6c198dda60cec2bed48655ee209eb46de20ab1e111"
+ // leave it here for future upgrade "SHA-512-256:34ffbf14183bdbc03a595ab16ff53141f10475d1c810a8baff43bc1645df31e9"
+ , value);
}
}
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index d2648b120..cafffbaef 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -61,6 +61,8 @@ import static org.apache.openmeetings.db.bind.Constants.VERSION_NODE;
import static org.apache.openmeetings.db.entity.user.PrivateMessage.INBOX_FOLDER_ID;
import static org.apache.openmeetings.db.entity.user.PrivateMessage.SENT_FOLDER_ID;
import static org.apache.openmeetings.db.entity.user.PrivateMessage.TRASH_FOLDER_ID;
+import static org.apache.openmeetings.util.ImportHelper.getPrivateValue;
+import static org.apache.openmeetings.util.ImportHelper.setPrivateValue;
import static org.apache.openmeetings.util.OmFileHelper.BCKP_RECORD_FILES;
import static org.apache.openmeetings.util.OmFileHelper.BCKP_ROOM_FILES;
import static org.apache.openmeetings.util.OmFileHelper.CSS_DIR;
@@ -223,6 +225,7 @@ import org.apache.openmeetings.db.entity.room.RoomPoll;
import org.apache.openmeetings.db.entity.room.RoomPollAnswer;
import org.apache.openmeetings.db.entity.server.LdapConfig;
import org.apache.openmeetings.db.entity.server.OAuthServer;
+import org.apache.openmeetings.db.entity.user.AsteriskSipUser;
import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.PrivateMessage;
@@ -733,8 +736,19 @@ public class BackupImport {
Long userId = u.getId();
u.setId(null);
- if (u.getSipUser() != null && u.getSipUser().getId() != 0) {
- u.getSipUser().setId(0);
+ if (u.getSipUser() != null) {
+ AsteriskSipUser sip = u.getSipUser();
+ String digest = getPrivateValue(sip, "passwordDigest", String.class);
+ if (digest == null || !setPrivateValue(sip, "userId", 0)) {
+ u.setSipUser(null);
+ } else {
+ if (!digest.contains(":")) {
+ setPrivateValue(sip, "passwordDigest", "MD5:" + digest);
+ setPrivateValue(sip, "supportedAlgorithmsUac", "MD5");
+ setPrivateValue(sip, "supportedAlgorithmsUas", "MD5");
+ }
+ sip.setUsername(u.getLogin());
+ }
}
if (AuthLevelUtil.hasLoginLevel(u.getRights()) && !Strings.isEmpty(u.getActivatehash())) {
u.setActivatehash(null);
diff --git a/openmeetings-server/src/site/markdown/AsteriskIntegration.md b/openmeetings-server/src/site/markdown/AsteriskIntegration.md
index 3fdc873dc..9129bcf52 100644
--- a/openmeetings-server/src/site/markdown/AsteriskIntegration.md
+++ b/openmeetings-server/src/site/markdown/AsteriskIntegration.md
@@ -27,11 +27,11 @@ or for example somebody from the list of
# Asterisk Integration
-You need Apache OpenMeetings <strong>version 6.0+</strong> to apply this guide!
+You need Apache OpenMeetings <strong>version 9.0+</strong> to apply this guide!
-You need Asterisk <strong>version 16+</strong> to apply this guide!
+You need Asterisk <strong>version 22+</strong> to apply this guide!
-Here is the instruction how-to set up integration between OpenMeetings and Asterisk on Ubuntu 18.04.
+Here is the instruction how-to set up integration between OpenMeetings and Asterisk on Ubuntu 24.04.
## Prerequisites
@@ -44,10 +44,10 @@ sudo apt update && sudo apt upgrade
```
sudo apt install build-essential
-sudo mkdir /usr/src/asterisk && cd /usr/src/asterisk
-sudo wget http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-18.12.1.tar.gz
-sudo tar -xvzf asterisk-18.12.1.tar.gz
-cd ./asterisk-18.12.1
+cd /usr/src
+sudo wget http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-22.8.2.tar.gz
+sudo tar -xzf asterisk-22.8.2.tar.gz
+cd ./asterisk-22.8.2
sudo make clean
sudo contrib/scripts/install_prereq install
sudo ./configure
@@ -81,12 +81,7 @@ Modify `[modules]` section of `/etc/asterisk/modules.conf`
```
preload = res_config_mysql.so
-```
-
-**Remove/Comment following lines**
-
-```
-;noload = chan_sip.so
+noload = chan_sip.so
```
### Configure MySQL module:
@@ -96,7 +91,7 @@ Set valid data for MySQL in `/etc/asterisk/res_config_mysql.conf`:
**Example**
```
-[general]
+[openmeetings]
dbhost = 127.0.0.1
dbname = openmeetings
dbuser = om_db_admin
@@ -107,37 +102,18 @@ dbcharset = utf8
requirements=warn
```
-### Configure SIP module:
-
-Modify `/etc/asterisk/sip.conf`
-
-**Add/uncomment the following lines**
-
-```
-videosupport=yes
-rtcachefriends=yes
-```
-
-**Increase maxexpiry value to 43200**
+### Configure sorcery:
-```
-maxexpiry=43200
-```
-
-**Add user for the "SIP Transport"**
+Add next lines into the /etc/asterisk/sorcery.conf
```
-[omsip_user]
-host=dynamic
-secret=12345
-context=rooms-omsip
-transport=ws,wss
-type=friend
-encryption=no
-avpf=yes
-icesupport=yes
-directmedia=no
-allow=!all,opus,h264
+[res_pjsip] ; Realtime PJSIP configuration wizard
+endpoint=realtime,ps_endpoints
+endpoint=config,pjsip.conf,criteria=type=endpoint
+auth=realtime,ps_auths
+auth=config,pjsip.conf,criteria=type=auth
+aor=realtime,ps_aors
+aor=config,pjsip.conf,criteria=type=aor
```
### Configure extensions:
@@ -146,7 +122,9 @@ Add next lines into the `/etc/asterisk/extconfig.conf`:
```
[settings]
-sippeers => mysql,general,sipusers
+ps_endpoints => mysql,openmeetings,om_sipuser_endpoint
+ps_aors => mysql,openmeetings,om_sipuser_aor
+ps_auths => mysql,openmeetings,om_sipuser_auth
```
Modify `/etc/asterisk/extensions.conf`
@@ -158,7 +136,7 @@ Modify `/etc/asterisk/extensions.conf`
; The first line DB_EXISTS(openmeetings/room/ does not belong to the openmeetings application
; but is the name of astDB containing the astDB family/key pair and values
; To Check if your astDB has been created do the following in a terminal window type the following:
-; asterisk –rx “database show”
+; asterisk -f -rx “database show”
; If you do not receive an output with that resembles openmeetings/rooms/400## where “##” will equal
; the extension assigned when you created your room
; If you do not receive the above output check your parameters in
@@ -169,18 +147,18 @@ Modify `/etc/asterisk/extensions.conf`
[rooms]
exten => _400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail)
-exten => _400X!,n(ok),SET(PIN=${DB(openmeetings/rooms/${EXTEN})})
-exten => _400X!,n,Set(CONFBRIDGE(user,template)=sip_user)
-exten => _400X!,n,Set(CONFBRIDGE(user,pin)=${PIN})
-exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,)
-exten => _400X!,n,Hangup
-exten => _400X!,n(notavail),Answer()
-exten => _400X!,n,Playback(invalid)
-exten => _400X!,n,Hangup
+ same => n(ok),SET(PIN=${DB(openmeetings/rooms/${EXTEN})})
+ same => n,Set(CONFBRIDGE(user,template)=ombridge_inbound_user)
+ same => n,Set(CONFBRIDGE(user,pin)=${PIN})
+ same => n(ok),Confbridge(${EXTEN},default_bridge,)
+ same => n,Hangup
+ same => n(notavail),Answer()
+ same => n,Playback(invalid)
+ same => n,Hangup
[rooms-originate]
-exten => _400X!,1,Confbridge(${EXTEN},default_bridge,sip_user)
-exten => _400X!,n,Hangup
+exten => _400X!,1,Confbridge(${EXTEN},default_bridge,ombridge_inbound_user)
+ same => n,Hangup
[rooms-out]
; *****************************************************
@@ -189,8 +167,8 @@ exten => _400X!,n,Hangup
[rooms-omsip]
exten => _400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail)
-exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,omsip_user)
-exten => _400X!,n(notavail),Hangup
+ same => n(ok),Confbridge(${EXTEN},default_bridge,ombridge_outbound_user)
+ same => n(notavail),Hangup
```
### Configure Confbridge
@@ -202,13 +180,13 @@ Modify `/etc/asterisk/confbridge.conf`
```
[general]
-[omsip_user]
+[ombridge_outbound_user]
type=user
marked=yes
dsp_drop_silence=yes
denoise=true
-[sip_user]
+[ombridge_inbound_user]
type=user
end_marked=yes
wait_marked=yes
@@ -274,6 +252,15 @@ If you're not already familiar with configuring Asterisk's chan_pjsip driver, vi
Modify `/etc/asterisk/pjsip.conf` as follows:
```
+; So users can login via for ex. soft-phone
+;
+[transport-udp]
+type=transport
+protocol=udp ;udp,tcp,tls,ws,wss,flow
+bind=0.0.0.0
+
+; This one for internal OM-to-SIP connections
+;
[transport-wss]
type=transport
protocol=wss
@@ -281,8 +268,32 @@ bind=0.0.0.0
; All other transport parameters are ignored for wss transports.
```
+**Add user for the "SIP Transport"**
+
+```
+[omsip_user]
+type=aor
+max_contacts=1
+remove_existing=yes
+
+[omsip_user]
+type=endpoint
+context=rooms-omsip
+disallow=all
+allow=ulaw,opus,h264
+transport=transport-wss
+auth=omsip_user
+aors=omsip_user
+
+[omsip_user]
+type=auth
+auth_type=userpass
+password=12345
+username=omsip_user
+```
+
## Call from room to external number
-Modify `/etc/asterisk/sip.conf`
+Modify `/etc/asterisk/pjsip.conf`
**Add your external provider**
@@ -317,6 +328,6 @@ Modify `/etc/asterisk/extensions.conf`
; Extensions for outgoing calls from Openmeetings room.
; *****************************************************
exten => _00000,1,Answer
-exten => _00000,n,Dial(SIP/00000@SIPNET,30)
-exten => _00000s,n,HangUp
+ same => n,Dial(PJSIP/00000@SIPNET,30)
+ same => n,HangUp
```
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java
index 05b68eca8..5ddddcae8 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.util;
+import java.lang.reflect.Field;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -47,4 +48,25 @@ public class ImportHelper {
return result;
}
+
+ public static boolean setPrivateValue(Object obj, String fieldName, Object value) {
+ try {
+ Field field = obj.getClass().getDeclaredField(fieldName);
+ field.setAccessible(true);
+ field.set(obj, value);
+ } catch (IllegalAccessException | NoSuchFieldException e) {
+ return false;
+ }
+ return true;
+ }
+
+ public static <T> T getPrivateValue(Object obj, String fieldName, Class<T> clazz) {
+ try {
+ Field field = obj.getClass().getDeclaredField(fieldName);
+ field.setAccessible(true);
+ return clazz.cast(field.get(obj));
+ } catch (IllegalAccessException | NoSuchFieldException e) {
+ return null;
+ }
+ }
}
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
index 1ec5ed310..4879c8aea 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
@@ -190,6 +190,8 @@ public class OpenmeetingsVariables {
private static boolean recordingsEnabled = true;
private static String theme = "Sandstone";
private static boolean otpEnabled = false;
+ public static int defaultSipMaxContacts = 1;
+ public static String defaultSipTransport = "transport-udp";
private OpenmeetingsVariables() {}
@@ -650,4 +652,20 @@ public class OpenmeetingsVariables {
public static void setOtpEnabled(boolean enabled) {
otpEnabled = enabled;
}
+
+ public static int getDefaultSipMaxContacts() {
+ return defaultSipMaxContacts;
+ }
+
+ public static void setDefaultSipMaxContacts(int max) {
+ defaultSipMaxContacts = max;
+ }
+
+ public static String getDefaultSipTransport() {
+ return defaultSipTransport;
+ }
+
+ public static void setDefaultSipTransport(String transport) {
+ defaultSipTransport = transport;
+ }
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
index 410d2ac89..b454c1019 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
@@ -302,7 +302,7 @@
<!--SIP Settings -->
<fieldset>
<legend class="text-end"><wicket:message key="1001" /></legend>
- <div class="formelement row">
+ <div class="formelement">
<i class="fas fa-info-circle m-1 text-info"></i><wicket:message key="1002" />
</div>
<div class="formelement row">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
index a88f8727d..7391d9cce 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
@@ -39,7 +39,6 @@ import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpRequest.BodyPublishers;
import java.net.http.HttpResponse.BodyHandlers;
-import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
@@ -171,11 +170,10 @@ public class UserManager implements IUserManager {
* @param password - user password
* @param hash - activation hash
* @return {@link User} of code of error as {@link String}
- * @throws NoSuchAlgorithmException in case password hashing algorithm is not found
* @throws OmException in case of any issues with provided data
*/
@Override
- public Object registerUser(User u, String password, String hash) throws OmException, NoSuchAlgorithmException {
+ public Object registerUser(User u, String password, String hash) throws OmException {
// Check for required data
String login = u.getLogin();
if (!Strings.isEmpty(login) && login.length() >= getMinLoginLength()) {
@@ -298,7 +296,7 @@ public class UserManager implements IUserManager {
httpClient = builder.build();
}
- public User loginOAuth(String code, OAuthServer server) throws IOException, NoSuchAlgorithmException, InterruptedException {
+ public User loginOAuth(String code, OAuthServer server) throws IOException, InterruptedException {
if (code == null) {
showAuth(server);
return null;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
index 2b74d339f..19cc0668f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
@@ -21,7 +21,6 @@ package org.apache.openmeetings.web.pages.auth;
import static org.apache.openmeetings.util.OpenmeetingsVariables.isAllowRegisterFrontend;
import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
import org.apache.openmeetings.db.dao.server.OAuth2Dao;
import org.apache.openmeetings.db.entity.server.OAuthServer;
@@ -142,7 +141,7 @@ public class SignInPage extends BaseInitedPage {
} else {
log.error("Failed to login via OAuth2!");
}
- } catch (IOException|NoSuchAlgorithmException|JSONException e) {
+ } catch (IOException|JSONException e) {
log.error("OAuth2 login error", e);
}
}
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings.properties b/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings.properties
index 681f3baa7..d68f75b84 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings.properties
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings.properties
@@ -65,6 +65,12 @@ nettest.max.clients=50
################## SIP ##################
### Should be updated with real values for Asterisk ###
+# This one specifies max amount of simultaneous connections
+# https://docs.asterisk.org/Configuration/Channel-Drivers/SIP/Configuring-res_pjsip/PJSIP-Configuration-Sections-and-Relationships/#aor
+sip.max.contacts=1
+# this one should be set to the transport configured for user login
+sip.transport=transport-udp
+## this one should be set to the IP asterisk is listening
sip.hostname=
sip.manager.port=5038
sip.manager.user=openmeetings
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
index a08977497..76a3c90f9 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
@@ -34,7 +34,6 @@ import static org.mockito.Mockito.doReturn;
import java.io.IOException;
import java.net.http.HttpRequest;
-import java.security.NoSuchAlgorithmException;
import org.apache.openmeetings.web.RegularTest;
import org.apache.openmeetings.db.dao.user.GroupDao;
@@ -71,7 +70,7 @@ class TestUserManagerMocked {
private UserManager userManager = Mockito.spy(new UserManager());
@Test
- void oauthTest() throws NoSuchAlgorithmException, IOException, InterruptedException {
+ void oauthTest() throws IOException, InterruptedException {
OAuthServer server = new OAuthServer()
.setName("Google")
.setIconUrl("https://www.google.com/images/google_favicon_128.png")
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/backup/TestImportUser.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/backup/TestImportUser.java
index 568e1c966..e79ba0b0b 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/backup/TestImportUser.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/backup/TestImportUser.java
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.backup;
+import static org.apache.openmeetings.util.ImportHelper.getPrivateValue;
import static org.apache.openmeetings.web.backup.TestImport.BACKUP_ROOT;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -55,11 +56,28 @@ class TestImportUser extends AbstractTestImport {
.getParentFile();
backupImport.importGroups(userRoot);
backupImport.importUsers(userRoot);
- assertEquals(userCount + 8, userDao.count(), "Users should be added");
+ assertEquals(userCount + 8, userDao.count(), "Exactly 8 users should be added");
User ext = userDao.getExternalUser("234", "TheBestCms");
assertNotNull(ext, "External user should be imported");
}
+ @Test
+ void testImportSipUsers() throws Exception {
+ long userCount = userDao.count();
+ File userRoot = new File(getClass().getClassLoader().getResource(BACKUP_ROOT + "user/sip/users.xml").toURI())
+ .getParentFile();
+ backupImport.importGroups(userRoot);
+ backupImport.importUsers(userRoot);
+ assertEquals(userCount + 1, userDao.count(), "Exactly 1 user should be added");
+
+ User u = userDao.getByLogin("TestImportUser#importSip1", User.Type.USER, null);
+ assertNotNull(u, "User MUST be successfully imported");
+ assertNotNull(u.getSipUser(), "SipUser should be NOT null");
+ assertEquals("MD5:fee3d8da8c8ba37330ba1e3a9f613407", getPrivateValue(u.getSipUser(), "passwordDigest", String.class), "Password");
+ assertEquals("MD5", getPrivateValue(u.getSipUser(), "supportedAlgorithmsUac", String.class), "supportedAlgorithmsUac");
+ assertEquals(u.getLogin(), getPrivateValue(u.getSipUser(), "id", String.class), "id");
+ }
+
@Test
void importNoLoginDeleted() throws Exception {
long userCount = userDao.count();
@@ -100,5 +118,4 @@ class TestImportUser extends AbstractTestImport {
u = userDao.getByLogin(login, User.Type.LDAP, ldap.getId());
assertNotNull(u, "User should be imported");
}
-
}
diff --git a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/sip/organizations.xml b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/sip/organizations.xml
new file mode 100644
index 000000000..63437a651
--- /dev/null
+++ b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/sip/organizations.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!-- ###############################################
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see https://openmeetings.apache.org/Upgrade.html for Details
+###############################################
+ --><root>
+ <organisations>
+ <organisation>
+ <created class="java.util.Date"><![CDATA[1576589928000]]></created>
+ <updated class="java.util.Date"><![CDATA[1539919117000]]></updated>
+ <deleted><![CDATA[false]]></deleted>
+ <organisation_id><![CDATA[1001]]></organisation_id>
+ <name><![CDATA[TheBestCms]]></name>
+ <limited><![CDATA[false]]></limited>
+ <restricted><![CDATA[false]]></restricted>
+ <maxFilesSize><![CDATA[0]]></maxFilesSize>
+ <maxRecordingsSize><![CDATA[0]]></maxRecordingsSize>
+ <maxRooms><![CDATA[0]]></maxRooms>
+ <recordingTtl><![CDATA[0]]></recordingTtl>
+ <reminderDays><![CDATA[0]]></reminderDays>
+ <external><![CDATA[true]]></external>
+ </organisation>
+ </organisations>
+</root>
diff --git a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/sip/users.xml b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/sip/users.xml
new file mode 100644
index 000000000..1c799d873
--- /dev/null
+++ b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/sip/users.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!-- ###############################################
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
+###############################################
+ --><root>
+ <users>
+ <user>
+ <user_id><![CDATA[1]]></user_id>
+ <age class="java.util.Date"><![CDATA[1502426202010]]></age>
+ <firstname><![CDATA[Zushid]]></firstname>
+ <lastname><![CDATA[Vrukyeri]]></lastname>
+ <login><![CDATA[TestImportUser#importSip1]]></login>
+ <pass><![CDATA[1000:CJcOXllfzJK/CC3xWdVT6PrgW0y0FtGNhwKQPVREn6d6pBDqxtI973Yj6d2VUkpP+i2Z2I9IVvDZjOi+DSaaslmaXUV5mM89eLEqy631vcsgHVWmzsAphtdpuTUkri07hE6KKGROLkmfFtD+K0v+gLyQFA0H2M11DKF9suLc5W4=:xdqnah+D81hn7IRReRdMzA0H37mfIyTM+itARUQWKCHAAzM2dgjaA8E4YKV6+NO+p1q9gWGRbNtHRMnXXGfWhY8D5pE3P7mvSxiy0UbYXcICzl1ZT8q1hg+vNDJBMIuAx9/FHd640847yYpPM2VymMOT1rXJW3T9NXR2qibSwPKmKajy6eIzf9dRPvnLDFGOEddpfUAydPIbRjwsVxH/XzZbYR9BJ6S+7/RlK1bIdEWVjb8QWEB1VAO/LMH0gB7nNsAtjhvAZ+uOWPIYyCPBX6wmi4keb4RyOE [...]
+ <regdate class="java.util.Date"><![CDATA[1502426202011]]></regdate>
+ <title_id><![CDATA[1]]></title_id>
+ <pictureuri><![CDATA[profile.jpg]]></pictureuri>
+ <deleted><![CDATA[false]]></deleted>
+ <language_id><![CDATA[1]]></language_id>
+ <address>
+ <country><![CDATA[UZ]]></country>
+ <mail><![CDATA[miuw.su@local]]></mail>
+ </address>
+ <organisations class="org.apache.openjpa.util.java$util$ArrayList$proxy">
+ <user_organisation>
+ <organisation_id><![CDATA[1]]></organisation_id>
+ <moderator><![CDATA[true]]></moderator>
+ </user_organisation>
+ <user_organisation>
+ <organisation_id><![CDATA[2]]></organisation_id>
+ <moderator><![CDATA[false]]></moderator>
+ </user_organisation>
+ <user_organisation>
+ <organisation_id><![CDATA[666666]]></organisation_id>
+ <moderator><![CDATA[false]]></moderator>
+ </user_organisation>
+ </organisations>
+ <timeZoneId><![CDATA[Europe/Berlin]]></timeZoneId>
+ <forceTimeZoneCheck><![CDATA[false]]></forceTimeZoneCheck>
+ <sendSMS>false</sendSMS>
+ <showContactData><![CDATA[false]]></showContactData>
+ <showContactDataToContacts><![CDATA[false]]></showContactDataToContacts>
+ <type><![CDATA[user]]></type>
+ <rights class="org.apache.openjpa.util.java$util$HashSet$proxy">
+ <right><![CDATA[Login]]></right>
+ <right><![CDATA[Admin]]></right>
+ <right><![CDATA[Dashboard]]></right>
+ <right><![CDATA[Room]]></right>
+ <right><![CDATA[Soap]]></right>
+ </rights>
+ <activatehash>test</activatehash>
+ <sipUser>
+ <id><![CDATA[1]]></id>
+ <type><![CDATA[friend]]></type>
+ <name><![CDATA[miuw.su]]></name>
+ <context><![CDATA[rooms]]></context>
+ <host><![CDATA[dynamic]]></host>
+ <ipaddr><![CDATA[]]></ipaddr>
+ <port><![CDATA[0]]></port>
+ <regseconds><![CDATA[0]]></regseconds>
+ <defaultuser><![CDATA[miuw.su]]></defaultuser>
+ <md5secret><![CDATA[fee3d8da8c8ba37330ba1e3a9f613407]]></md5secret>
+ <nat><![CDATA[force_rport,comedia]]></nat>
+ <allow><![CDATA[ulaw;alaw;h264]]></allow>
+ </sipUser>
+ </user>
+ </users>
+</root>
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
index 18bf1ceb2..e32b374e0 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
@@ -26,7 +26,6 @@ import static org.apache.openmeetings.webservice.Constants.TNS;
import static org.apache.openmeetings.webservice.Constants.USER_SERVICE_NAME;
import static org.apache.openmeetings.webservice.Constants.USER_SERVICE_PORT_NAME;
-import java.security.NoSuchAlgorithmException;
import java.util.List;
import java.util.Locale;
@@ -244,7 +243,7 @@ public class UserWebService extends BaseWebService {
try {
jsonUser.addGroup(groupDao.get(getDefaultGroup()));
ouser = userManager.registerUser(jsonUser, user.getPassword(), null);
- } catch (NoSuchAlgorithmException | OmException e) {
+ } catch (OmException e) {
throw new InternalServiceException("Unexpected error while creating user");
}