notazof
/
yavsc
1
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

cleaning and refactoring chat system 

and also fixing chat inputs validation.
vnext
Paul Schneider 5 years ago
parent 0adabdc0f0
commit c2f0db5daa
8 changed files with 167 additions and 165 deletions
Show Stats Download Patch File Download Diff File

BIN
src/Yavsc/Hubs/.ChatHub.cs.swp
View File

Binary file not shown.

186
src/Yavsc/Hubs/ChatHub.cs
Unescape Escape View File

@ -20,7 +20,6 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
using System; using System;
using System.Collections.Concurrent;
using Microsoft.AspNet.SignalR; using Microsoft.AspNet.SignalR;
using Microsoft.Data.Entity; using Microsoft.Data.Entity;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
@ -32,12 +31,9 @@ using Microsoft.Extensions.Localization;
namespace Yavsc namespace Yavsc
{ {
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Models; using Models;
using Models.Chat; using Models.Chat;
using Yavsc.Abstract.Chat; using Yavsc.Abstract.Chat;
using Yavsc.Attributes.Validation;
using Yavsc.Services; using Yavsc.Services;
public partial class ChatHub : Hub, IDisposable public partial class ChatHub : Hub, IDisposable
{ {
@ -46,7 +42,7 @@ namespace Yavsc
private IStringLocalizer _localizer; private IStringLocalizer _localizer;
ILogger _logger; ILogger _logger;
public HubInputValidator HubInputValidator { get; } public HubInputValidator InputValidator { get; }
public ChatHub() public ChatHub()
{ {
@ -64,74 +60,50 @@ namespace Yavsc
NotifyUser(NotificationTypes.Error, context, error); NotifyUser(NotificationTypes.Error, context, error);
}); });
_logger = loggerFactory.CreateLogger<ChatHub>(); _logger = loggerFactory.CreateLogger<ChatHub>();
HubInputValidator = new HubInputValidator { NotifyUser = this.NotifyUser }; InputValidator = new HubInputValidator { NotifyUser = this.NotifyUser };
} }
void SetUserName(string cxId, string userName) void SetUserName(string cxId, string userName)
{ {
_cxManager.SetUserName( cxId, userName); _cxManager.SetUserName(cxId, userName);
} }
public override async Task OnConnected() public override async Task OnConnected()
{ {
bool isAuth = false; bool isAuth = (Context.User != null);
bool isCop = false; bool isCop = false;
string userName = setUserName(); string userName = setUserName();
if (Context.User != null) if (isAuth)
{ {
isAuth = Context.User.Identity.IsAuthenticated;
var group = isAuth ? var group = isAuth ?
ChatHubConstants.HubGroupAuthenticated : ChatHubConstants.HubGroupAnonymous; ChatHubConstants.HubGroupAuthenticated : ChatHubConstants.HubGroupAnonymous;
// Log ("Cx: " + group); // Log ("Cx: " + group);
await Groups.Add(Context.ConnectionId, group); await Groups.Add(Context.ConnectionId, group);
if (isAuth) _logger.LogInformation(_localizer.GetString(ChatHubConstants.LabAuthChatUser));
{
_logger.LogInformation(_localizer.GetString(ChatHubConstants.LabAuthChatUser));
var userId = _dbContext.Users.First(u => u.UserName == userName).Id;
var userHadConnections = _dbContext.ChatConnection.Any(accx => accx.ConnectionId == Context.ConnectionId); var userId = _dbContext.Users.First(u => u.UserName == userName).Id;
if (userHadConnections) Clients.Group(ChatHubConstants.HubGroupFollowingPrefix + userId).notifyUser(NotificationTypes.Connected, userName, null);
{ isCop = Context.User.IsInRole(Constants.AdminGroupName) ;
var ccx = _dbContext.ChatConnection.First(c => c.ConnectionId == Context.ConnectionId); if (isCop)
ccx.Connected = true; {
} await Groups.Add(Context.ConnectionId, ChatHubConstants.HubGroupCops);
else
_dbContext.ChatConnection.Add(new ChatConnection
{
ApplicationUserId = userId,
ConnectionId = Context.ConnectionId,
UserAgent = Context.Request.Headers["User-Agent"],
Connected = true
});
_dbContext.SaveChanges();
Clients.Group(ChatHubConstants.HubGroupFollowingPrefix + userId).notifyUser(NotificationTypes.Connected, userName, null);
isCop = Context.User.IsInRole(Constants.AdminGroupName) ;
if (isCop)
{
await Groups.Add(Context.ConnectionId, ChatHubConstants.HubGroupCops);
}
foreach (var uid in _dbContext.CircleMembers.Select(m => m.MemberId))
{
await Groups.Add(Context.ConnectionId, ChatHubConstants.HubGroupFollowingPrefix + uid);
}
} }
else
foreach (var uid in _dbContext.CircleMembers.Select(m => m.MemberId))
{ {
// this line isn't reached: Context.User != null <=> Context.User.Identity.IsAuthenticated await Groups.Add(Context.ConnectionId, ChatHubConstants.HubGroupFollowingPrefix + uid);
throw new NotSupportedException("Context.User != null && no auth");
} }
} }
else else
{ {
await Groups.Add(Context.ConnectionId, ChatHubConstants.HubGroupAnonymous); await Groups.Add(Context.ConnectionId, ChatHubConstants.HubGroupAnonymous);
} }
_cxManager.OnConnected(userName, isCop); _cxManager.OnConnected(Context.ConnectionId, isCop);
await base.OnConnected(); await base.OnConnected();
} }
string setUserName() string setUserName()
{ {
if (Context.User != null) if (Context.User != null)
@ -160,53 +132,27 @@ namespace Yavsc
var userId = user.Id; var userId = user.Id;
Clients.Group(ChatHubConstants.HubGroupFollowingPrefix + userId).notifyUser(NotificationTypes.DisConnected, userName, null); Clients.Group(ChatHubConstants.HubGroupFollowingPrefix + userId).notifyUser(NotificationTypes.DisConnected, userName, null);
var cx = _dbContext.ChatConnection.SingleOrDefault(c => c.ConnectionId == Context.ConnectionId); _cxManager.OnDisctonnected(Context.ConnectionId);
if (cx != null)
{
_dbContext.ChatConnection.Remove(cx);
_dbContext.SaveChanges();
}
else
_logger.LogError($"Could not remove user cx {Context.ConnectionId}");
} }
_cxManager.Abort(Context.ConnectionId);
return base.OnDisconnected(stopCalled); return base.OnDisconnected(stopCalled);
} }
public override Task OnReconnected() public override Task OnReconnected()
{ {
var isCop = Context.User?.IsInRole(Constants.AdminGroupName) ?? false;
var userName = setUserName();
if (Context.User != null) if (Context.User.Identity.IsAuthenticated) if (Context.User != null) if (Context.User.Identity.IsAuthenticated)
{ {
var userName = Context.User.Identity.Name;
var user = _dbContext.Users.FirstOrDefault(u => u.UserName == userName);
var userId = user.Id;
var userHadConnections = _dbContext.ChatConnection.Any(accx => accx.ConnectionId == Context.ConnectionId);
if (userHadConnections)
{
var ccx = _dbContext.ChatConnection.First(c => c.ConnectionId == Context.ConnectionId);
ccx.Connected = true;
}
else
_dbContext.ChatConnection.Add(new ChatConnection
{
ApplicationUserId = userId,
ConnectionId = Context.ConnectionId,
UserAgent = Context.Request.Headers["User-Agent"],
Connected = true
});
_dbContext.SaveChanges();
Clients.Group("authenticated").notifyUser(NotificationTypes.Reconnected, userName, "reconnected"); Clients.Group("authenticated").notifyUser(NotificationTypes.Reconnected, userName, "reconnected");
} }
_cxManager.OnConnected(Context.ConnectionId, isCop);
return base.OnReconnected(); return base.OnReconnected();
} }
public void Nick(string nickName) public void Nick(string nickName)
{ {
if (!HubInputValidator.ValidateUserName(nickName)) return; if (!InputValidator.ValidateUserName(nickName)) return;
var candidate = "?" + nickName; var candidate = "?" + nickName;
if (_cxManager.IsConnected(candidate)) if (_cxManager.IsConnected(candidate))
@ -227,7 +173,12 @@ namespace Yavsc
public ChatRoomInfo Join(string roomName) public ChatRoomInfo Join(string roomName)
{ {
if (!HubInputValidator.ValidateRoomName(roomName)) return null; _logger.LogInformation($"Join:{roomName}");
if (!InputValidator.ValidateRoomName(roomName))
{
_logger.LogError("!InputValidator.ValidateRoomName(roomName)");
return null;
}
var roomGroupName = ChatHubConstants.HubGroupRomsPrefix + roomName; var roomGroupName = ChatHubConstants.HubGroupRomsPrefix + roomName;
var user = _cxManager.GetUserName(Context.ConnectionId); var user = _cxManager.GetUserName(Context.ConnectionId);
@ -235,22 +186,25 @@ namespace Yavsc
ChatRoomInfo chanInfo; ChatRoomInfo chanInfo;
if (!_cxManager.IsPresent(roomName, user)) if (!_cxManager.IsPresent(roomName, user))
{ {
chanInfo = _cxManager.Join(roomName, user); _logger.LogInformation($"Joining");
chanInfo = _cxManager.Join(roomName, Context.ConnectionId);
Clients.Group(roomGroupName).notifyRoom(NotificationTypes.UserJoin, roomName, user); Clients.Group(roomGroupName).notifyRoom(NotificationTypes.UserJoin, roomName, user);
} else{ } else{
_logger.LogInformation($"already present");
// in case in an additional connection, // in case in an additional connection,
// one only send info on room without // one only send info on room without
// warning any other user. // warning any other user.
_cxManager.TryGetChanInfo(roomName, out chanInfo); _cxManager.TryGetChanInfo(roomName, out chanInfo);
} }
_logger.LogInformation($"returning chan info");
return chanInfo; return chanInfo;
} }
[Authorize] [Authorize]
public void Register(string room) public void Register(string room)
{ {
if (!HubInputValidator.ValidateRoomName(room)) return ; if (!InputValidator.ValidateRoomName(room)) return ;
var existent = _dbContext.ChatRoom.Any(r => r.Name == room); var existent = _dbContext.ChatRoom.Any(r => r.Name == room);
if (existent) if (existent)
{ {
@ -276,9 +230,9 @@ namespace Yavsc
[Authorize] [Authorize]
public void KickBan(string roomName, string userName, string reason) public void KickBan(string roomName, string userName, string reason)
{ {
if (!HubInputValidator.ValidateRoomName(roomName)) return ; if (!InputValidator.ValidateRoomName(roomName)) return ;
if (!HubInputValidator.ValidateUserName(userName)) return ; if (!InputValidator.ValidateUserName(userName)) return ;
if (!HubInputValidator.ValidateReason(reason)) return; if (!InputValidator.ValidateReason(reason)) return;
Kick(roomName, userName, reason); Kick(roomName, userName, reason);
Ban(roomName, userName, reason); Ban(roomName, userName, reason);
} }
@ -286,9 +240,9 @@ namespace Yavsc
[Authorize] [Authorize]
public void Kick(string roomName, string userName, string reason) public void Kick(string roomName, string userName, string reason)
{ {
if (!HubInputValidator.ValidateRoomName(roomName)) return ; if (!InputValidator.ValidateRoomName(roomName)) return ;
if (!HubInputValidator.ValidateUserName(userName)) return ; if (!InputValidator.ValidateUserName(userName)) return ;
if (!HubInputValidator.ValidateReason(reason)) return; if (!InputValidator.ValidateReason(reason)) return;
ChatRoomInfo chanInfo; ChatRoomInfo chanInfo;
var roomGroupName = ChatHubConstants.HubGroupRomsPrefix + roomName; var roomGroupName = ChatHubConstants.HubGroupRomsPrefix + roomName;
if (_cxManager.TryGetChanInfo(roomName, out chanInfo)) if (_cxManager.TryGetChanInfo(roomName, out chanInfo))
@ -311,9 +265,9 @@ namespace Yavsc
[Authorize] [Authorize]
public void Ban(string roomName, string userName, string reason) public void Ban(string roomName, string userName, string reason)
{ {
if (!HubInputValidator.ValidateRoomName(roomName)) return ; if (!InputValidator.ValidateRoomName(roomName)) return ;
if (!HubInputValidator.ValidateUserName(userName)) return ; if (!InputValidator.ValidateUserName(userName)) return ;
if (!HubInputValidator.ValidateReason(reason)) return; if (!InputValidator.ValidateReason(reason)) return;
var cxIds = _cxManager.GetConnexionIds(userName); var cxIds = _cxManager.GetConnexionIds(userName);
throw new NotImplementedException(); throw new NotImplementedException();
} }
@ -321,15 +275,15 @@ namespace Yavsc
[Authorize] [Authorize]
public void Gline(string userName, string reason) public void Gline(string userName, string reason)
{ {
if (!HubInputValidator.ValidateUserName(userName)) return ; if (!InputValidator.ValidateUserName(userName)) return ;
if (!HubInputValidator.ValidateReason(reason)) return; if (!InputValidator.ValidateReason(reason)) return;
throw new NotImplementedException(); throw new NotImplementedException();
} }
public void Part(string roomName, string reason) public void Part(string roomName, string reason)
{ {
if (!HubInputValidator.ValidateRoomName(roomName)) return ; if (!InputValidator.ValidateRoomName(roomName)) return ;
if (!HubInputValidator.ValidateReason(reason)) return; if (!InputValidator.ValidateReason(reason)) return;
if (_cxManager.Part(Context.ConnectionId, roomName, reason)) if (_cxManager.Part(Context.ConnectionId, roomName, reason))
{ {
var roomGroupName = ChatHubConstants.HubGroupRomsPrefix + roomName; var roomGroupName = ChatHubConstants.HubGroupRomsPrefix + roomName;
@ -351,13 +305,20 @@ namespace Yavsc
public void Send(string roomName, string message) public void Send(string roomName, string message)
{ {
if (!HubInputValidator.ValidateRoomName(roomName)) return ; _logger.LogInformation($"Send {roomName} {message}");
if (!HubInputValidator.ValidateMessage(message)) return ; if (!InputValidator.ValidateRoomName(roomName)) {
_logger.LogError($"Invalid roomName : {roomName}");
return ;
}
if (!InputValidator.ValidateMessage(message)) {
_logger.LogError($"Invalid message : {message}");
return ;
}
var groupname = ChatHubConstants.HubGroupRomsPrefix + roomName; var groupname = ChatHubConstants.HubGroupRomsPrefix + roomName;
ChatRoomInfo chanInfo ; ChatRoomInfo chanInfo ;
if (!_cxManager.TryGetChanInfo(roomName, out chanInfo)) if (!_cxManager.TryGetChanInfo(roomName, out chanInfo))
{ {
_logger.LogError($"No such room : {roomName}");
var noChanMsg = _localizer.GetString(ChatHubConstants.LabNoSuchChan).ToString(); var noChanMsg = _localizer.GetString(ChatHubConstants.LabNoSuchChan).ToString();
NotifyUserInRoom(NotificationTypes.Error, roomName, noChanMsg); NotifyUserInRoom(NotificationTypes.Error, roomName, noChanMsg);
return; return;
@ -365,14 +326,17 @@ namespace Yavsc
var userName = _cxManager.GetUserName(Context.ConnectionId); var userName = _cxManager.GetUserName(Context.ConnectionId);
if (!_cxManager.IsPresent(roomName, userName)) if (!_cxManager.IsPresent(roomName, userName))
{ {
_logger.LogError($"{userName} Not present in room : {roomName}");
var notSentMsg = _localizer.GetString(ChatHubConstants.LabnoJoinNoSend).ToString(); var notSentMsg = _localizer.GetString(ChatHubConstants.LabnoJoinNoSend).ToString();
NotifyUserInRoom(NotificationTypes.Error, roomName, notSentMsg); NotifyUserInRoom(NotificationTypes.Error, roomName, notSentMsg);
return; return;
} }
Clients.Group(groupname).addMessage(userName, roomName, message); Clients.Group(groupname).addMessage(userName, roomName, message);
} }
void NotifyUser(string type, string targetId, string message) void NotifyUser(string type, string targetId, string message)
{ {
_logger.LogInformation("notifying user {type} {targetId} : {message}");
Clients.Caller.notifyUser(type, targetId, message); Clients.Caller.notifyUser(type, targetId, message);
} }
void NotifyUserInRoom(string type, string room, string message) void NotifyUserInRoom(string type, string room, string message)
@ -383,8 +347,19 @@ namespace Yavsc
[Authorize] [Authorize]
public void SendPV(string userName, string message) public void SendPV(string userName, string message)
{ {
if (!HubInputValidator.ValidateUserName(userName)) return ; _logger.LogInformation($"Sending pv to {userName}");
if (!HubInputValidator.ValidateMessage(message)) return ;
if (!InputValidator.ValidateUserName(userName))
{
_logger.LogError($"Invalid username : {userName}");
return ;
}
if (!InputValidator.ValidateMessage(message))
{
_logger.LogError($"Invalid message : {message}");
return ;
}
_logger.LogInformation($"Message form is validated.");
if (userName[0] != '?') if (userName[0] != '?')
if (!Context.User.IsInRole(Constants.AdminGroupName)) if (!Context.User.IsInRole(Constants.AdminGroupName))
@ -397,24 +372,33 @@ namespace Yavsc
if (bl.Count() > 0) if (bl.Count() > 0)
{ {
_logger.LogError($"Black listed : {Context.User.Identity.Name}");
NotifyUser(NotificationTypes.PrivateMessageDenied, userName, "you are black listed."); NotifyUser(NotificationTypes.PrivateMessageDenied, userName, "you are black listed.");
return; return;
} }
_logger.LogInformation("Sender is no black listed");
} }
_logger.LogInformation("getting cx id´s");
var cxIds = _cxManager.GetConnexionIds(userName); var cxIds = _cxManager.GetConnexionIds(userName);
if (cxIds!=null) if (cxIds==null || cxIds.Count()==0)
foreach (var connectionId in cxIds) _logger.LogError($"No such connected user : {userName}");
else foreach (var connectionId in cxIds)
{ {
_logger.LogInformation($"cx: {connectionId}");
var cli = Clients.Client(connectionId); var cli = Clients.Client(connectionId);
_logger.LogInformation($"cli: {cli.ToString()}");
cli.addPV(Context.User.Identity.Name, message); cli.addPV(Context.User.Identity.Name, message);
_logger.LogInformation($"Sent pv to cx {connectionId}");
} }
} }
[Authorize] [Authorize]
public void SendStream(string connectionId, long streamId, string message) public void SendStream(string connectionId, long streamId, string message)
{ {
if (!HubInputValidator.ValidateMessage(message)) return; if (!InputValidator.ValidateMessage(message)) return;
var sender = Context.User.Identity.Name; var sender = Context.User.Identity.Name;
var cli = Clients.Client(connectionId); var cli = Clients.Client(connectionId);
cli.addStreamInfo(sender, streamId, message); cli.addStreamInfo(sender, streamId, message);

14
src/Yavsc/Hubs/HubInputValidator.cs
Unescape Escape View File

@ -36,14 +36,20 @@ namespace Yavsc
} }
public bool ValidateUserName (string userName) public bool ValidateUserName (string userName)
{ {
bool valid = ValidateStringLength(userName, 1,12); bool valid = true;
if (valid) valid = IsLetterOrDigit(userName);
NotifyUser(NotificationTypes.Error, "char:"+userName.First (c => !char.IsLetterOrDigit(c)), ChatHub.InvalidUserName); if (userName.Length<1 || userName[0] == '?' && userName.Length<2) valid = false;
if (valid) {
string suname = (userName[0] == '?') ? userName.Substring(1) : userName;
if (valid) valid = ValidateStringLength(suname, 1,12);
if (valid) valid = IsLetterOrDigit(userName);
}
if (!valid) NotifyUser(NotificationTypes.Error, "userName" , ChatHub.InvalidUserName);
return valid; return valid;
} }
public bool ValidateMessage (string message) public bool ValidateMessage (string message)
{ {
if (!ValidateStringLength(message, 1,240)) if (!ValidateStringLength(message, 1, 10240))
{ {
NotifyUser(NotificationTypes.Error, "message", ChatHub.InvalidMessage); NotifyUser(NotificationTypes.Error, "message", ChatHub.InvalidMessage);
return false; return false;

7
src/Yavsc/Interfaces/IConnexionManager.cs
Unescape Escape View File

@ -8,11 +8,13 @@ namespace Yavsc.Services
void SetUserName(string cxId, string userName); void SetUserName(string cxId, string userName);
string GetUserName (string cxId); string GetUserName (string cxId);
void OnConnected(string userName, bool isCop); void OnConnected(string cxId, bool isCop);
bool IsConnected(string candidate); bool IsConnected(string candidate);
void OnDisctonnected (string cxId);
bool IsPresent(string roomName, string userName); bool IsPresent(string roomName, string userName);
ChatRoomInfo Join(string roomName, string userName); ChatRoomInfo Join(string roomName, string cxId);
bool Part(string cxId, string roomName, string reason); bool Part(string cxId, string roomName, string reason);
@ -25,7 +27,6 @@ namespace Yavsc.Services
bool TryGetChanInfo(string room, out ChatRoomInfo chanInfo); bool TryGetChanInfo(string room, out ChatRoomInfo chanInfo);
IEnumerable<string> GetConnexionIds(string userName); IEnumerable<string> GetConnexionIds(string userName);
void Abort(string connectionId);
void SetErrorHandler(Action<string,string> errorHandler); void SetErrorHandler(Action<string,string> errorHandler);
IEnumerable<ChannelShortInfo> ListChannels(string pattern); IEnumerable<ChannelShortInfo> ListChannels(string pattern);

72
src/Yavsc/Services/ChatHubConnexionManager.cs
Unescape Escape View File

@ -77,16 +77,19 @@ namespace Yavsc.Services
} }
ChatUserNames[cxId] = userName; ChatUserNames[cxId] = userName;
} }
// Username must have been set before calling this method.
public void OnConnected(string userName, bool isCop) public void OnConnected(string cxId, bool isCop)
{ {
ChatRoomPresence[userName] = new List<string>(); var username = ChatUserNames[cxId];
_isCop[userName] = isCop; if (!IsConnected(username))
ChatRoomPresence[username] = new List<string>();
_isCop[username] = isCop;
} }
public bool IsConnected(string candidate) public bool IsConnected(string candidate)
{ {
return ChatRoomPresence[candidate] != null; return ChatRoomPresence.ContainsKey(candidate)
&& ChatRoomPresence[candidate] != null;
} }
public bool IsPresent(string roomName, string userName) public bool IsPresent(string roomName, string userName)
@ -98,26 +101,27 @@ namespace Yavsc.Services
{ {
return _isCop[userName]; return _isCop[userName];
} }
public void Abort(string connectionId)
public void OnDisctonnected(string connectionId)
{ {
string uname; string uname;
if (!ChatUserNames.TryRemove(connectionId, out uname)) if (!ChatUserNames.TryRemove(connectionId, out uname))
_logger.LogError($"Could not remove user name for cx {connectionId}"); _logger.LogError($"Could not get removed user name for cx {connectionId}");
else else
{ {
List<string> cxIds; List<string> cxIds;
if (ChatCxIds.TryGetValue(uname, out cxIds)) if (ChatCxIds.TryGetValue(uname, out cxIds))
{ {
cxIds.Remove(connectionId); cxIds.Remove(connectionId);
foreach (var room in ChatRoomPresence[uname])
{
Part(connectionId, room, "connexion aborted");
}
} }
else else
_logger.LogError($"Could not remove user cx {connectionId}"); _logger.LogError($"Could not remove user cx {connectionId}");
foreach (var room in ChatRoomPresence[uname])
{
Part(connectionId, room, "connexion aborted");
}
ChatRoomPresence[uname] = null; ChatRoomPresence[uname] = null;
} }
} }
@ -128,12 +132,15 @@ namespace Yavsc.Services
var userName = ChatUserNames[cxId]; var userName = ChatUserNames[cxId];
if (Channels.TryGetValue(roomName, out chanInfo)) if (Channels.TryGetValue(roomName, out chanInfo))
{ {
if (!chanInfo.Users.Contains(userName)) if (!chanInfo.Users.Contains(cxId))
{ {
// TODO NotifyErrorToCaller(roomName, "you didn't join."); // TODO NotifyErrorToCaller(roomName, "you didn't join.");
return false; return false;
} }
chanInfo.Users.Remove(userName); // FIXME only remove cx, not username,
// as long as he might be connected
// from another device, to the same room
chanInfo.Users.Remove(cxId);
if (chanInfo.Users.Count == 0) if (chanInfo.Users.Count == 0)
{ {
ChatRoomInfo deadchanInfo; ChatRoomInfo deadchanInfo;
@ -153,8 +160,10 @@ namespace Yavsc.Services
} }
} }
public ChatRoomInfo Join(string roomName, string userName) public ChatRoomInfo Join(string roomName, string cxId)
{ {
var userName = ChatUserNames[cxId];
_logger.LogInformation($"Join: {userName}=>{roomName}"); _logger.LogInformation($"Join: {userName}=>{roomName}");
ChatRoomInfo chanInfo; ChatRoomInfo chanInfo;
// if channel already is open // if channel already is open
@ -172,13 +181,14 @@ namespace Yavsc.Services
{ {
if (isCop(userName)) if (isCop(userName))
{ {
chanInfo.Ops.Add(userName); chanInfo.Ops.Add(cxId);
} }
else{ else{
chanInfo.Users.Add(userName); chanInfo.Users.Add(cxId);
} }
_logger.LogInformation($"existing room joint: {userName}=>{roomName}"); _logger.LogInformation($"existing room joint: {userName}=>{roomName}");
ChatRoomPresence[userName].Add(roomName); if (!ChatRoomPresence[userName].Contains(roomName))
ChatRoomPresence[userName].Add(roomName);
return chanInfo; return chanInfo;
} }
} }
@ -198,13 +208,13 @@ namespace Yavsc.Services
{ {
chanInfo.Topic = room.Topic; chanInfo.Topic = room.Topic;
chanInfo.Name = room.Name; chanInfo.Name = room.Name;
chanInfo.Users.Add(userName); chanInfo.Users.Add(cxId);
} }
else else
{ // a first join, we create it. { // a first join, we create it.
chanInfo.Name = roomName; chanInfo.Name = roomName;
chanInfo.Topic = _localizer.GetString(ChatHubConstants.JustCreatedBy)+userName; chanInfo.Topic = _localizer.GetString(ChatHubConstants.JustCreatedBy)+userName;
chanInfo.Ops.Add(userName); chanInfo.Ops.Add(cxId);
} }
if (Channels.TryAdd(roomName, chanInfo)) if (Channels.TryAdd(roomName, chanInfo))
@ -291,8 +301,8 @@ namespace Yavsc.Services
} }
var kickerName = GetUserName(cxId); var kickerName = GetUserName(cxId);
if (!chanInfo.Ops.Contains(kickerName)) if (!chanInfo.Ops.Contains(cxId))
if (!chanInfo.Hops.Contains(kickerName)) if (!chanInfo.Hops.Contains(cxId))
{ {
_errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabYouNotOp).ToString()); _errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabYouNotOp).ToString());
return false; return false;
@ -303,8 +313,9 @@ namespace Yavsc.Services
_errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabNoSuchUser).ToString()); _errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabNoSuchUser).ToString());
return false; return false;
} }
if (chanInfo.Hops.Contains(kickerName)) var ucxs = GetConnexionIds(userName);
if (chanInfo.Ops.Contains(userName)) if (chanInfo.Hops.Contains(cxId))
if (chanInfo.Ops.Any(c => ucxs.Contains(c)))
{ {
_errorHandler(roomName, _localizer.GetString(ChatHubConstants.HopWontKickOp).ToString()); _errorHandler(roomName, _localizer.GetString(ChatHubConstants.HopWontKickOp).ToString());
return false; return false;
@ -316,15 +327,16 @@ namespace Yavsc.Services
} }
// all good, time to kick :-) // all good, time to kick :-)
foreach (var ucx in ucxs) {
if (chanInfo.Users.Contains(userName)) if (chanInfo.Users.Contains(ucx))
chanInfo.Users.Remove(userName); chanInfo.Users.Remove(ucx);
else if (chanInfo.Ops.Contains(userName)) else if (chanInfo.Ops.Contains(ucx))
chanInfo.Ops.Remove(userName); chanInfo.Ops.Remove(ucx);
else if (chanInfo.Hops.Contains(userName)) else if (chanInfo.Hops.Contains(ucx))
chanInfo.Hops.Remove(userName); chanInfo.Hops.Remove(ucx);
}
return true; return true;

3
src/Yavsc/Services/YavscMessageSender.cs
Unescape Escape View File

@ -125,8 +125,7 @@ namespace Yavsc.Services
var hubClient = hubContext.Clients.User(cxid); var hubClient = hubContext.Clients.User(cxid);
var data = new Dictionary<string, object>(); var data = new Dictionary<string, object>();
data["event"] = ev; data["event"] = ev;
hubClient.push(ev.Topic, JsonConvert.SerializeObject(data));
hubClient.push(ev.Topic, data);
} }
result.message_id = MimeKit.Utils.MimeUtils.GenerateMessageId( result.message_id = MimeKit.Utils.MimeUtils.GenerateMessageId(

44
src/Yavsc/wwwroot/js/chat.js
Unescape Escape View File

@ -61,7 +61,7 @@ window.ChatHubHandler = (function ($) {
// Create a function that the hub can call back to display messages. // Create a function that the hub can call back to display messages.
chat.client.addMessage = function (name, room, message) { chat.client.addMessage = function (name, room, message) {
// Add the message to the page. // Add the message to the page.
var $userTag = $('<a>' + htmlEncode(name) + '</a>').click(function() { var $userTag = $('<a>' + htmlEncode(name) + '</a>').click(function () {
buildPv(name); buildPv(name);
}); });
var $li = $('<li class="discussion"></li>'); var $li = $('<li class="discussion"></li>');
@ -111,12 +111,12 @@ window.ChatHubHandler = (function ($) {
chat.client.addPublicStream = function (pubStrInfo) { chat.client.addPublicStream = function (pubStrInfo) {
$('<li></li>').append(pubStrInfo.sender + ': ') $('<li></li>').append(pubStrInfo.sender + ': ')
.append('<a href="' + pubStrInfo.url + '">' + pubStrInfo.title + '</a>').append('[' + pubStrInfo.mediaType + ']').addClass('streaminfo').appendTo(notifications); .append('<a href="' + pubStrInfo.url + '">' + pubStrInfo.title + '</a>').append('[' + pubStrInfo.mediaType + ']').addClass('streaminfo').appendTo(notifications);
}; };
chat.client.push = function (what, data) { chat.client.push = function (what, data) {
$('<li></li>').append(what + ': ') $('<li></li>').append(what + ': ')
.append(data.event).addClass('event').appendTo(notifications); .append(data).addClass('event').appendTo(notifications);
}; };
var setChanInfo = function (chanInfo) { var setChanInfo = function (chanInfo) {
@ -191,18 +191,17 @@ window.ChatHubHandler = (function ($) {
.keydown(function (ev) { .keydown(function (ev) {
if (ev.which == 13) { if (ev.which == 13) {
if (this.value.length == 0) return; if (this.value.length == 0) return;
sendCmd(chanName, this.value); sendCmd(chanName, this.value);
// chat.server.send(chanName, this.value);
this.value = ''; this.value = '';
} }
}).appendTo(roomview); }).appendTo(roomview);
if (chanType == 'r') chans.push(chanName); if (chanType == 'r') chans.push(chanName);
else if (chanType == 'u' || chanType == 'a') userlist.push(chanName); else if (chanType == 'u' || chanType == 'a') userlist.push(chanName);
setActiveChan(chanId); setActiveChan(chanId);
}; };
var buildRoom = function (roomName) { var buildRoom = function (roomName) {
if (!chans.some(function(cname) { return cname == roomName; })) { if (!chans.some(function (cname) { return cname == roomName; })) {
buildChan('#', 'r', roomName, chat.server.send); buildChan('#', 'r', roomName, chat.server.send);
} }
}; };
@ -216,7 +215,7 @@ window.ChatHubHandler = (function ($) {
} }
var buildPv = function (userName) { var buildPv = function (userName) {
if (!userlist.some(function(uname) { return uname == userName; })) { if (!userlist.some(function (uname) { return uname == userName; })) {
if (userName[0] == '?') buildChan('@?', 'a', userName.slice(1), chat.server.sendPV); if (userName[0] == '?') buildChan('@?', 'a', userName.slice(1), chat.server.sendPV);
else buildChan('@', 'u', userName, chat.server.sendPV); else buildChan('@', 'u', userName, chat.server.sendPV);
} }
@ -238,8 +237,8 @@ window.ChatHubHandler = (function ($) {
$view.removeClass('disabled'); $view.removeClass('disabled');
setTimeout(function () { setTimeout(function () {
chans.forEach(function (chan) { chans.forEach(function (chan) {
join(chan); join(chan);
}); });
}, 120); }, 120);
} }
@ -256,10 +255,10 @@ window.ChatHubHandler = (function ($) {
$.connection.hub.disconnected(function () { $.connection.hub.disconnected(function () {
onDisCx(); onDisCx();
setTimeout(function () { setTimeout(function () {
$.connection.hub.start().done(function () { $.connection.hub.start().done(function () {
onCx(); onCx();
}); });
}, 30000); // Re-start connection after 30 seconds }, 30000); // Re-start connection after 30 seconds
}); });
chanName.keydown(function (event) { chanName.keydown(function (event) {
@ -272,7 +271,7 @@ window.ChatHubHandler = (function ($) {
// else TODO showRoomInfo(this.value); // else TODO showRoomInfo(this.value);
}); });
ptc.click(function() { ptc.click(function () {
DestroyRoom(); DestroyRoom();
}); });
@ -288,15 +287,16 @@ window.ChatHubHandler = (function ($) {
var addChatUser = function (uname) { var addChatUser = function (uname) {
$('#u_' + uname).remove(); ulist.children('li').filter(function () {
// ulist.remove("li.user[data='"+uname+"']"); return $(this).data('uname') == uname;
}).remove();
$('<li class="user"><img src="/Avatars/' + uname + '.xs.png"> ' + uname + '</li>') $('<li class="user"><img src="/Avatars/' + uname + '.xs.png"> ' + uname + '</li>')
.prop('id', 'u_' + uname) .data('uname', uname)
.css('cursor', 'pointer') .css('cursor', 'pointer')
.click(function () { .click(function () {
buildPv(uname); buildPv(uname);
}) })
.appendTo(ulist); .appendTo(ulist);
}; };
@ -306,7 +306,7 @@ window.ChatHubHandler = (function ($) {
return encodedValue; return encodedValue;
} }
$(window).unload(function () { $.connection.hub.abort() }); $(window).unload(function () { $.connection.hub.stop() });
}; };

6
src/Yavsc/wwwroot/js/chat.min.js vendored
Unescape Escape View File

@ -2,9 +2,9 @@
window.ChatHubHandler=(function($){$.fn.filterByData=function(prop,val){return this.filter(function(){return $(this).data(prop)==val;});};var ChatView=function($view,full){if(!full)throw new Error('not implemented');var chans=[];var userlist=[];var frontChanId;var ulist=$('<ul></ul>').addClass('userlist');var notifications=$('<ul></ul>').addClass('notifs');ulist.appendTo($view);notifications.appendTo($view);var onUserDisconnected=function(uname){$('#u'+uname).remove();};var onUserConnected=function(username){addChatUser(username);};var chat=$.connection.chatHub;chat.client.addMessage=function(name,room,message){var $userTag=$('<a>'+htmlEncode(name)+'</a>').click(function(){buildPv(name);});var $li=$('<li class="discussion"></li>');$userTag.appendTo($li);$li.append(' '+htmlEncode(message));$li.appendTo($('#r'+room));};chat.client.addPV=function(name,message){if(!$('#mute').prop('checked')){audio.play();} window.ChatHubHandler=(function($){$.fn.filterByData=function(prop,val){return this.filter(function(){return $(this).data(prop)==val;});};var ChatView=function($view,full){if(!full)throw new Error('not implemented');var chans=[];var userlist=[];var frontChanId;var ulist=$('<ul></ul>').addClass('userlist');var notifications=$('<ul></ul>').addClass('notifs');ulist.appendTo($view);notifications.appendTo($view);var onUserDisconnected=function(uname){$('#u'+uname).remove();};var onUserConnected=function(username){addChatUser(username);};var chat=$.connection.chatHub;chat.client.addMessage=function(name,room,message){var $userTag=$('<a>'+htmlEncode(name)+'</a>').click(function(){buildPv(name);});var $li=$('<li class="discussion"></li>');$userTag.appendTo($li);$li.append(' '+htmlEncode(message));$li.appendTo($('#r'+room));};chat.client.addPV=function(name,message){if(!$('#mute').prop('checked')){audio.play();}
buildPv(name);$('#u'+name).append('<li class="pv"><strong>'+htmlEncode(name)+'</strong>: '+htmlEncode(message)+'</li>');};chat.client.notifyRoom=function(tag,targetid,message){if(tag==='connected'||tag==='reconnected'){onUserConnected(targetid,message);return;}else if(tag==='disconnected'){onUserDisconnected(targetid,message);return;} buildPv(name);$('#u'+name).append('<li class="pv"><strong>'+htmlEncode(name)+'</strong>: '+htmlEncode(message)+'</li>');};chat.client.notifyRoom=function(tag,targetid,message){if(tag==='connected'||tag==='reconnected'){onUserConnected(targetid,message);return;}else if(tag==='disconnected'){onUserDisconnected(targetid,message);return;}
$('<li></li>').addClass(tag).append(tag+': ').append(message).addClass(tag).appendTo($('#room_'+targetid));};chat.client.notifyUser=function(tag,targetid,message){if(tag==='connected'||tag==='reconnected'){onUserConnected(targetid,message);return;}else if(tag==='disconnected'){onUserDisconnected(targetid,message);return;} $('<li></li>').addClass(tag).append(tag+': ').append(message).addClass(tag).appendTo($('#room_'+targetid));};chat.client.notifyUser=function(tag,targetid,message){if(tag==='connected'||tag==='reconnected'){onUserConnected(targetid,message);return;}else if(tag==='disconnected'){onUserDisconnected(targetid,message);return;}
$('<li></li>').append(tag+': '+targetid+': ').append(message).addClass(tag).appendTo(notifications);};chat.client.notifyUserInRoom=function(tag,room,message){$('<li></li>').append(tag+': ').append(message).addClass(tag).appendTo($('#room_'+room));};chat.client.addPublicStream=function(pubStrInfo){$('<li></li>').append(pubStrInfo.sender+': ').append('<a href="'+pubStrInfo.url+'">'+pubStrInfo.title+'</a>').append('['+pubStrInfo.mediaType+']').addClass('streaminfo').appendTo(notifications);};chat.client.push=function(what,data){$('<li></li>').append(what+': ').append(data.event).addClass('event').appendTo(notifications);};var setChanInfo=function(chanInfo){if(chanInfo){var chanId='r'+chanInfo.Name;$('#tv_'+chanId).replaceWith(chanInfo.Topic);}};var setActiveChan=function(chanId){if(frontChanId!=chanId){if(frontChanId){$('#sel_'+frontChanId).addClass('btn-primary');$('#v'+frontChanId).addClass('hidden');} $('<li></li>').append(tag+': '+targetid+': ').append(message).addClass(tag).appendTo(notifications);};chat.client.notifyUserInRoom=function(tag,room,message){$('<li></li>').append(tag+': ').append(message).addClass(tag).appendTo($('#room_'+room));};chat.client.addPublicStream=function(pubStrInfo){$('<li></li>').append(pubStrInfo.sender+': ').append('<a href="'+pubStrInfo.url+'">'+pubStrInfo.title+'</a>').append('['+pubStrInfo.mediaType+']').addClass('streaminfo').appendTo(notifications);};chat.client.push=function(what,data){$('<li></li>').append(what+': ').append(data).addClass('event').appendTo(notifications);};var setChanInfo=function(chanInfo){if(chanInfo){var chanId='r'+chanInfo.Name;$('#tv_'+chanId).replaceWith(chanInfo.Topic);}};var setActiveChan=function(chanId){if(frontChanId!=chanId){if(frontChanId){$('#sel_'+frontChanId).addClass('btn-primary');$('#v'+frontChanId).addClass('hidden');}
frontChanId=chanId;$('#sel_'+chanId).removeClass('btn-primary');$('#v'+chanId).removeClass('hidden');$('#inp_'+chanId).focus();}};var join=function(roomName){chat.server.join(roomName).done(function(chatInfo){if(chatInfo){setChanInfo(chatInfo);setActiveChan('r'+chatInfo.Name);}});};var chatbar=$('<div class="chatbar form-group"></div>');var roomjoin=$('<div class="chatctl" ></div>');var roomlist=$('<div class="roomlist"></div>');roomlist.appendTo(chatbar);var ptc=$('<img src="/images/ptcroix.png" >').addClass('ptcroix');$('<label for="channame">Join&nbsp;:</label>').appendTo(roomjoin);var chanName=$('<input id="channame" title="channel name" hint="yavsc" >');chanName.appendTo(roomjoin);ptc.appendTo(roomjoin);roomjoin.appendTo(chatbar);chatbar.appendTo($view);var chatlist=$('<div class="chatlist" ></div>');chatlist.appendTo($view);var buildChan=function(chdp,chanType,chanName,sendCmd){var chanId=chanType+chanName;var roomTag=$('<a>'+chdp+chanName+'</a>').addClass('btn');roomTag.prop('id','sel_'+chanId).click(function(){setActiveChan(chanId);$(this).removeClass('btn-primary');});roomTag.appendTo(roomlist);var roomview=$('<div></div>').addClass('container');roomview.appendTo(chatlist);roomview.prop('id','v'+chanId);$('<div></div>').prop('id','tv_'+chanId).appendTo(roomview);var msglist=$('<ul></ul>').addClass('mesglist');msglist.prop('id',chanId);msglist.appendTo(roomview);$('<input type="text">').prop('id','inp_'+chanId).prop('enable',false).prop('hint','hello').prop('title','send to '+chanName).addClass('form-control').keydown(function(ev){if(ev.which==13){if(this.value.length==0)return;sendCmd(chanName,this.value);this.value='';}}).appendTo(roomview);if(chanType=='r')chans.push(chanName);else if(chanType=='u'||chanType=='a')userlist.push(chanName);setActiveChan(chanId);};var buildRoom=function(roomName){if(!chans.some(function(cname){return cname==roomName;})){buildChan('#','r',roomName,chat.server.send);}};var DestroyRoom=function(){if(frontChanId){$('#v'+frontChanId).remove();$('#sel_'+frontChanId).remove();frontChanId=null;}} frontChanId=chanId;$('#sel_'+chanId).removeClass('btn-primary');$('#v'+chanId).removeClass('hidden');$('#inp_'+chanId).focus();}};var join=function(roomName){chat.server.join(roomName).done(function(chatInfo){if(chatInfo){setChanInfo(chatInfo);setActiveChan('r'+chatInfo.Name);}});};var chatbar=$('<div class="chatbar form-group"></div>');var roomjoin=$('<div class="chatctl" ></div>');var roomlist=$('<div class="roomlist"></div>');roomlist.appendTo(chatbar);var ptc=$('<img src="/images/ptcroix.png" >').addClass('ptcroix');$('<label for="channame">Join&nbsp;:</label>').appendTo(roomjoin);var chanName=$('<input id="channame" title="channel name" hint="yavsc" >');chanName.appendTo(roomjoin);ptc.appendTo(roomjoin);roomjoin.appendTo(chatbar);chatbar.appendTo($view);var chatlist=$('<div class="chatlist" ></div>');chatlist.appendTo($view);var buildChan=function(chdp,chanType,chanName,sendCmd){var chanId=chanType+chanName;var roomTag=$('<a>'+chdp+chanName+'</a>').addClass('btn');roomTag.prop('id','sel_'+chanId).click(function(){setActiveChan(chanId);$(this).removeClass('btn-primary');});roomTag.appendTo(roomlist);var roomview=$('<div></div>').addClass('container');roomview.appendTo(chatlist);roomview.prop('id','v'+chanId);$('<div></div>').prop('id','tv_'+chanId).appendTo(roomview);var msglist=$('<ul></ul>').addClass('mesglist');msglist.prop('id',chanId);msglist.appendTo(roomview);$('<input type="text">').prop('id','inp_'+chanId).prop('enable',false).prop('hint','hello').prop('title','send to '+chanName).addClass('form-control').keydown(function(ev){if(ev.which==13){if(this.value.length==0)return;sendCmd(chanName,this.value);this.value='';}}).appendTo(roomview);if(chanType=='r')chans.push(chanName);else if(chanType=='u'||chanType=='a')userlist.push(chanName);setActiveChan(chanId);};var buildRoom=function(roomName){if(!chans.some(function(cname){return cname==roomName;})){buildChan('#','r',roomName,chat.server.send);}};var DestroyRoom=function(){if(frontChanId){$('#v'+frontChanId).remove();$('#sel_'+frontChanId).remove();frontChanId=null;}}
var buildPv=function(userName){if(!userlist.some(function(uname){return uname==userName;})){if(userName[0]=='?')buildChan('@?','a',userName.slice(1),chat.server.sendPV);else buildChan('@','u',userName,chat.server.sendPV);}};$view.data('chans').split(',').forEach(function(chan){buildRoom(chan);});function onCx(){$view.removeClass('disabled');setTimeout(function(){chans.forEach(function(chan){join(chan);});},120);} var buildPv=function(userName){if(!userlist.some(function(uname){return uname==userName;})){if(userName[0]=='?')buildChan('@?','a',userName.slice(1),chat.server.sendPV);else buildChan('@','u',userName,chat.server.sendPV);}};$view.data('chans').split(',').forEach(function(chan){buildRoom(chan);});function onCx(){$view.removeClass('disabled');setTimeout(function(){chans.forEach(function(chan){join(chan);});},120);}
function onDisCx(){$view.addClass('disabled');} function onDisCx(){$view.addClass('disabled');}
$.connection.hub.start().done(function(){onCx();});$.connection.hub.disconnected(function(){onDisCx();setTimeout(function(){$.connection.hub.start().done(function(){onCx();});},30000);});chanName.keydown(function(event){if(event.which==13){if(this.value.length==0)return;buildRoom(this.value);join(this.value);this.value='';}});ptc.click(function(){DestroyRoom();});var audio=new Audio('/sounds/bell.mp3');$('#command').keydown(function(event){if(event.which==13){}});var addChatUser=function(uname){$('#u_'+uname).remove();$('<li class="user"><img src="/Avatars/'+uname+'.xs.png"> '+uname+'</li>').prop('id','u_'+uname).css('cursor','pointer').click(function(){buildPv(uname);}).appendTo(ulist);};function htmlEncode(value){var encodedValue=$('<div />').text(value).html();return encodedValue;} $.connection.hub.start().done(function(){onCx();});$.connection.hub.disconnected(function(){onDisCx();setTimeout(function(){$.connection.hub.start().done(function(){onCx();});},30000);});chanName.keydown(function(event){if(event.which==13){if(this.value.length==0)return;buildRoom(this.value);join(this.value);this.value='';}});ptc.click(function(){DestroyRoom();});var audio=new Audio('/sounds/bell.mp3');$('#command').keydown(function(event){if(event.which==13){}});var addChatUser=function(uname){ulist.children('li').filter(function(){return $(this).data('uname')==uname;}).remove();$('<li class="user"><img src="/Avatars/'+uname+'.xs.png"> '+uname+'</li>').data('uname',uname).css('cursor','pointer').click(function(){buildPv(uname);}).appendTo(ulist);};function htmlEncode(value){var encodedValue=$('<div />').text(value).html();return encodedValue;}
$(window).unload(function(){$.connection.hub.abort()});};$(document).ready(function($){ChatView($('#chatview'),true);});})(window.jQuery); $(window).unload(function(){$.connection.hub.stop()});};$(document).ready(function($){ChatView($('#chatview'),true);});})(window.jQuery);
Write Preview
Loading…