diff --git a/C-TRACK/Web.config b/C-TRACK/Web.config
index fc64814..9f19232 100644
--- a/C-TRACK/Web.config
+++ b/C-TRACK/Web.config
@@ -50,43 +50,29 @@
-
-
-
-
-
+
-
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/C-TRACK/WebUserControls/mod_addTask.ascx.cs b/C-TRACK/WebUserControls/mod_addTask.ascx.cs
index 52a3a7d..4647f8c 100644
--- a/C-TRACK/WebUserControls/mod_addTask.ascx.cs
+++ b/C-TRACK/WebUserControls/mod_addTask.ascx.cs
@@ -31,15 +31,6 @@ namespace C_TRACK.WebUserControls
divArticolo.Attributes.Add("class", CodArticolo != "" ? "col-3 text-center table-success text-success" : "col-3 text-center text-secondary");
divCommessa.Attributes.Add("class", NumTask != "" ? "col-3 text-center table-success text-success" : "col-3 text-center text-secondary");
divQta.Attributes.Add("class", Quantita > 0 ? "col-3 text-center table-success text-success" : "col-3 text-center text-secondary");
-
- //lblCodArt.CssClass = CodArticolo != "" ? "btn btn-sm btn-block btn-success" : "text-secondary";
- //lblNumTask.CssClass = NumTask != "" ? "btn btn-sm btn-block btn-success" : "text-secondary";
- //lblQta.CssClass = Quantita > 0 ? "btn btn-sm btn-block btn-success" : "text-secondary";
-
- //lblCodArt.CssClass = CodArticolo != "" ? "text-success" : "text-secondary";
- //lblNumTask.CssClass = NumTask != "" ? "text-success" : "text-secondary";
- //lblQta.CssClass = Quantita > 0 ? "text-success" : "text-secondary";
-
}
///
/// RegExp x Cod ARTICOLO
diff --git a/C-TRACK/WebUserControls/mod_login.ascx.cs b/C-TRACK/WebUserControls/mod_login.ascx.cs
index 7707ae7..d04ecae 100644
--- a/C-TRACK/WebUserControls/mod_login.ascx.cs
+++ b/C-TRACK/WebUserControls/mod_login.ascx.cs
@@ -1,277 +1,269 @@
-using System;
-using System.Data;
-using System.Configuration;
-using System.Collections;
-using System.Web;
-using System.Web.Security;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.WebControls.WebParts;
-using System.Web.UI.HtmlControls;
using SteamWare;
+using System;
+using System.Web.UI;
namespace C_TRACK.WebUserControls
{
- ///
- /// classe gestione login e forzatura login
- ///
- public partial class mod_login : SteamWare.UserControl
+ ///
+ /// classe gestione login e forzatura login
+ ///
+ public partial class mod_login : SteamWare.UserControl
+ {
+ protected override void OnInit(EventArgs e)
{
- protected override void OnInit(EventArgs e)
- {
- base.OnInit(e);
- if (!Page.IsPostBack)
- {
- traduciObj();
- }
- }
- #region area protected/private
-
- #region area proprietà
-
- private SteamWare.loginMode _isForceUser = SteamWare.loginMode.normale;
-
- #endregion
-
- #region area metodi
-
- ///
- /// imposta la modalità di login tra normale / forceUser
- ///
- private void setLoginMode()
- {
- if (_isForceUser == SteamWare.loginMode.forceUser)
- {
- pnlForceUser.Visible = true;
- }
- else
- {
- pnlForceUser.Visible = false;
- }
- }
-
- protected void traduciObj()
- {
- lblPwd.Text = user_std.UtSn.Traduci("lblPwd");
- lblUser.Text = user_std.UtSn.Traduci("lblUser");
- lblDominio.Text = user_std.UtSn.Traduci("lblDominio");
- lblTitolo.Text = user_std.UtSn.Traduci("ForzaUtente");
- btnOk.Text = user_std.UtSn.Traduci("btnCommit");
- }
-
- ///
- /// prova a verificare se l'utente sia ok x AD credentials
- ///
- private void AdLogin()
- {
- lblMessage.Text = "User not authenticated...";
- if (Page.User.Identity.IsAuthenticated)
- {
- //recupera user windows se c'è...
- string ad_name = Page.User.Identity.Name;
- string delimStr = "\\";
- char[] delimiter = delimStr.ToCharArray();
- string[] dom_user = ad_name.Split(delimiter, 2);
- // passo al controllo di verifica ADuserOk...
- user_std _utente = new user_std();
- if (_utente.ADuserOk(dom_user[0], dom_user[1]))
- {
- bool fatto = _utente.startUpUtente(dom_user[0], dom_user[1]);
- if (fatto)
- {
- // salvo cookie!
- string DeviceName = "";
- string IPv4 = "";
- string userAgent = "";
- try
- {
- userAgent = Request.UserAgent;
- DeviceName = Request.UserHostName;
- IPv4 = Request.UserHostName;
- }
- catch
- { }
- if (memLayer.ML.confReadBool("enableCookie"))
- {
- // elimino eventuali altri cookie x dominio/user/devName
- DataWrap.DW.taAnagDev.delByDominioUserDeviceName(dom_user[0], dom_user[1], DeviceName);
- // creo nuovo cookie
- authProxy.createNewCookie(dom_user[0], dom_user[1], 0, DeviceName, userAgent, IPv4, memLayer.ML.confReadString("CodModulo"), DateTime.Now.AddDays(memLayer.ML.confReadInt("cookieDayExp")));
- }
- // loggo
- SteamWare.logger.lg.scriviLog(string.Format("L'utente {0} ({1}) ha effettuato il login correttamente", _utente.CognomeNome, _utente.userNameAD), SteamWare.tipoLog.INFO);
- if (Login_ok != null)
- {
- Login_ok(this, new EventArgs());
- }
- }
- else
- {
- lblMessage.Text = String.Format("{0}
There are some problems instatiating user: {1}/{2}", user_std.UtSn.Traduci("AccessFail"), dom_user[0], dom_user[1]);
- SteamWare.logger.lg.scriviLog(String.Format("Accesso fallito, problemi ad istanziare l'utente {0}/{1}", dom_user[0], dom_user[1]), SteamWare.tipoLog.ERROR);
- if (Login_Error != null)
- {
- Login_Error(this, new EventArgs());
- }
- }
- }
- else
- {
- lblMessage.Text = String.Format("{0}
user not allowed: {1}/{2}", user_std.UtSn.Traduci("AccessFail"), dom_user[0], dom_user[1]);
- SteamWare.logger.lg.scriviLog(String.Format("Utente non autorizzato: {0}/{1}", dom_user[0], dom_user[1]), SteamWare.tipoLog.WARNING);
- if (Login_Error != null)
- {
- Login_Error(this, new EventArgs());
- }
- }
- }
- else
- {
- lblMessage.Text = user_std.UtSn.Traduci("AccessFail") + user_std.UtSn.Traduci("UsrNotAuth");
- SteamWare.logger.lg.scriviLog(String.Format("Accesso fallito, utente non autenticato"), SteamWare.tipoLog.WARNING);
- if (Login_Error != null)
- {
- Login_Error(this, new EventArgs());
- }
- }
- }
-
- ///
- /// effettua verifiche e se concesso permette di forzare l'accesso utente
- ///
- private void ForceUserIdentity()
- {
- if (Page.User.Identity.IsAuthenticated)
- {
- bool _allowForceUser = false;
- try
- {
- _allowForceUser = SteamWare.memLayer.ML.confReadBool("_allowForceUser");
- }
- catch
- {
- _allowForceUser = false;
- }
- if (_allowForceUser)
- {
- if (authKey.Text == "forzaInter") // verifica passphrase...
- {
- user_std _utente = new user_std();
- user_std.UtSn.isForcedUser = true;
- bool fatto = _utente.startUpUtente(dominio.Text, user.Text);
- if (fatto)
- {
- string _rigaLog = String.Format("User {0} has forced user identity ok: logged as \t {1}\\{2}", Page.User.Identity.Name, dominio.Text, user.Text);
- SteamWare.logger.lg.scriviLog(_rigaLog, SteamWare.tipoLog.INFO);
- if (Login_ok != null)
- {
- Login_ok(this, new EventArgs());
- }
- }
- }
- else
- {
- lblMessage.Text = String.Format("{0}
key not allowed for operation!!! operation logged!!!", user_std.UtSn.Traduci("AccessFail"));
- gestEmail.geAuth.mandaEmail(email.senderEmail, email.adminEmail, "Attenzione: tentativo di accesso non autorizzato!", String.Format("Tentativo di forcing user non autorizzato!
L'utente {0} ha tentato di accedere a {1} forzando l'utente ma la sua key autorizzativa e' sbagliata...", Page.User.Identity.Name, user_std.UtSn.Traduci(SteamWare.memLayer.ML.confReadString("defaultApp"))));
- string _rigaLog = String.Format("User {0}\t tried to force user - wrong password - he tried to log as \t {1}\\{2}", Page.User.Identity.Name, dominio.Text, user.Text);
- SteamWare.logger.lg.scriviLog(_rigaLog, SteamWare.tipoLog.WARNING);
- if (Login_Error != null)
- {
- Login_Error(this, new EventArgs());
- }
- }
- }
- else
- {
- gestEmail.geAuth.mandaEmail(email.senderEmail, email.adminEmail, "Attenzione: tentativo di accesso non autorizzato!", String.Format("Tentativo di forcing user non autorizzato!
L'utente {0} ha tentato di accedere a {1} forzando l'utente ma la funzione e' disabilitata...", Page.User.Identity.Name, user_std.UtSn.Traduci(SteamWare.memLayer.ML.confReadString("defaultApp"))));
- string _rigaLog = String.Format("User {0}\t tried to force user - access disabled - he tried to log as \t {1}\\{2}", Page.User.Identity.Name, dominio.Text, user.Text);
- SteamWare.logger.lg.scriviLog(_rigaLog, SteamWare.tipoLog.WARNING);
- if (Login_Error != null)
- {
- Login_Error(this, new EventArgs());
- }
- }
- }
- else
- {
- lblMessage.Text = string.Format("{0}
user not authenticated!
", user_std.UtSn.Traduci("AccessFail"));
- if (Login_Error != null)
- {
- Login_Error(this, new EventArgs());
- }
- string _rigaLog = String.Format("\t Someone tried to force user - real user: \t - not autenticated - \t tried to log as \t {0}\\{1}", dominio.Text, user.Text);
- SteamWare.logger.lg.scriviLog(_rigaLog, SteamWare.tipoLog.WARNING);
- }
- }
-
- protected void btnOk_Click(object sender, EventArgs e)
- {
- ForceUserIdentity();
- }
-
- #endregion
-
- #endregion
-
- #region area public
-
- #region eventi pubblici esposti
-
- public event EventHandler Login_ok;
- public event EventHandler Login_Error;
-
- #endregion
-
- #region area proprietà
-
- ///
- /// modalità funzionamento controllo tra normale (ActiveDirectory e user auth di default) e forceUser
- ///
- public SteamWare.loginMode modoLogin
- {
- get
- {
- return _isForceUser;
- }
- set
- {
- _isForceUser = value;
- }
- }
-
- #endregion
-
-
- ///
- /// avvio pagina
- ///
- protected void Page_Load(object sender, EventArgs e)
- {
- // procedo...
- setLoginMode();
- Session.RemoveAll();
- if (_isForceUser == SteamWare.loginMode.normale)
- {
- bool cookieLogin = false;
- if (memLayer.ML.confReadBool("enableCookie"))
- {
- cookieLogin = devicesAuthProxy.stObj.isAuth;// authProxy.tryAuthByCookie(memLayer.ML.confReadString("AuthCookie"));
- }
- if (!cookieLogin)
- {
- AdLogin();
- }
- else
- {
- if (Login_ok != null)
- {
- Login_ok(this, new EventArgs());
- }
- }
- }
- }
-
- #endregion
-
+ base.OnInit(e);
+ if (!Page.IsPostBack)
+ {
+ traduciObj();
+ }
}
+ #region area protected/private
+
+ #region area proprietà
+
+ private SteamWare.loginMode _isForceUser = SteamWare.loginMode.normale;
+
+ #endregion
+
+ #region area metodi
+
+ ///
+ /// imposta la modalità di login tra normale / forceUser
+ ///
+ private void setLoginMode()
+ {
+ if (_isForceUser == SteamWare.loginMode.forceUser)
+ {
+ pnlForceUser.Visible = true;
+ }
+ else
+ {
+ pnlForceUser.Visible = false;
+ }
+ }
+
+ protected void traduciObj()
+ {
+ lblPwd.Text = user_std.UtSn.Traduci("lblPwd");
+ lblUser.Text = user_std.UtSn.Traduci("lblUser");
+ lblDominio.Text = user_std.UtSn.Traduci("lblDominio");
+ lblTitolo.Text = user_std.UtSn.Traduci("ForzaUtente");
+ btnOk.Text = user_std.UtSn.Traduci("btnCommit");
+ }
+
+ ///
+ /// prova a verificare se l'utente sia ok x AD credentials
+ ///
+ private void AdLogin()
+ {
+ lblMessage.Text = "User not authenticated...";
+ if (Page.User.Identity.IsAuthenticated)
+ {
+ //recupera user windows se c'è...
+ string ad_name = Page.User.Identity.Name;
+ string delimStr = "\\";
+ char[] delimiter = delimStr.ToCharArray();
+ string[] dom_user = ad_name.Split(delimiter, 2);
+ // passo al controllo di verifica ADuserOk...
+ user_std _utente = new user_std();
+ if (_utente.ADuserOk(dom_user[0], dom_user[1]))
+ {
+ bool fatto = _utente.startUpUtente(dom_user[0], dom_user[1]);
+ if (fatto)
+ {
+ // salvo cookie!
+ string DeviceName = "";
+ string IPv4 = "";
+ string userAgent = "";
+ try
+ {
+ userAgent = Request.UserAgent;
+ DeviceName = Request.UserHostName;
+ IPv4 = Request.UserHostName;
+ }
+ catch
+ { }
+ if (memLayer.ML.confReadBool("enableCookie"))
+ {
+ // elimino eventuali altri cookie x dominio/user/devName
+ DataWrap.DW.taAnagDev.delByDominioUserDeviceName(dom_user[0], dom_user[1], DeviceName);
+ // creo nuovo cookie
+ authProxy.createNewCookie(dom_user[0], dom_user[1], 0, DeviceName, userAgent, IPv4, memLayer.ML.confReadString("CodModulo"), DateTime.Now.AddDays(memLayer.ML.confReadInt("cookieDayExp")));
+ }
+ // loggo
+ SteamWare.logger.lg.scriviLog(string.Format("L'utente {0} ({1}) ha effettuato il login correttamente", _utente.CognomeNome, _utente.userNameAD), SteamWare.tipoLog.INFO);
+ if (Login_ok != null)
+ {
+ Login_ok(this, new EventArgs());
+ }
+ }
+ else
+ {
+ lblMessage.Text = String.Format("{0}
There are some problems instatiating user: {1}/{2}", user_std.UtSn.Traduci("AccessFail"), dom_user[0], dom_user[1]);
+ SteamWare.logger.lg.scriviLog(String.Format("Accesso fallito, problemi ad istanziare l'utente {0}/{1}", dom_user[0], dom_user[1]), SteamWare.tipoLog.ERROR);
+ if (Login_Error != null)
+ {
+ Login_Error(this, new EventArgs());
+ }
+ }
+ }
+ else
+ {
+ lblMessage.Text = String.Format("{0}
user not allowed: {1}/{2}", user_std.UtSn.Traduci("AccessFail"), dom_user[0], dom_user[1]);
+ SteamWare.logger.lg.scriviLog(String.Format("Utente non autorizzato: {0}/{1}", dom_user[0], dom_user[1]), SteamWare.tipoLog.WARNING);
+ if (Login_Error != null)
+ {
+ Login_Error(this, new EventArgs());
+ }
+ }
+ }
+ else
+ {
+ lblMessage.Text = user_std.UtSn.Traduci("AccessFail") + user_std.UtSn.Traduci("UsrNotAuth");
+ SteamWare.logger.lg.scriviLog(String.Format("Accesso fallito, utente non autenticato"), SteamWare.tipoLog.WARNING);
+ if (Login_Error != null)
+ {
+ Login_Error(this, new EventArgs());
+ }
+ }
+ }
+
+ ///
+ /// effettua verifiche e se concesso permette di forzare l'accesso utente
+ ///
+ private void ForceUserIdentity()
+ {
+ if (Page.User.Identity.IsAuthenticated)
+ {
+ bool _allowForceUser = false;
+ try
+ {
+ _allowForceUser = SteamWare.memLayer.ML.CRB("_allowForceUser");
+ }
+ catch
+ {
+ _allowForceUser = false;
+ }
+ if (_allowForceUser)
+ {
+ if (authKey.Text == "forzaInter") // verifica passphrase...
+ {
+ user_std _utente = new user_std();
+ user_std.UtSn.isForcedUser = true;
+ bool fatto = _utente.startUpUtente(dominio.Text, user.Text);
+ if (fatto)
+ {
+ string _rigaLog = String.Format("User {0} has forced user identity ok: logged as \t {1}\\{2}", Page.User.Identity.Name, dominio.Text, user.Text);
+ SteamWare.logger.lg.scriviLog(_rigaLog, SteamWare.tipoLog.INFO);
+ if (Login_ok != null)
+ {
+ Login_ok(this, new EventArgs());
+ }
+ }
+ }
+ else
+ {
+ lblMessage.Text = String.Format("{0}
key not allowed for operation!!! operation logged!!!", user_std.UtSn.Traduci("AccessFail"));
+ gestEmail.geAuth.mandaEmail(email.senderEmail, email.adminEmail, "Attenzione: tentativo di accesso non autorizzato!", String.Format("Tentativo di forcing user non autorizzato!
L'utente {0} ha tentato di accedere a {1} forzando l'utente ma la sua key autorizzativa e' sbagliata...", Page.User.Identity.Name, memLayer.ML.CRS("appName")));
+ string _rigaLog = String.Format("User {0}\t tried to force user - wrong password - he tried to log as \t {1}\\{2}", Page.User.Identity.Name, dominio.Text, user.Text);
+ SteamWare.logger.lg.scriviLog(_rigaLog, SteamWare.tipoLog.WARNING);
+ if (Login_Error != null)
+ {
+ Login_Error(this, new EventArgs());
+ }
+ }
+ }
+ else
+ {
+ gestEmail.geAuth.mandaEmail(email.senderEmail, email.adminEmail, "Attenzione: tentativo di accesso non autorizzato!", String.Format("Tentativo di forcing user non autorizzato!
L'utente {0} ha tentato di accedere a {1} forzando l'utente ma la funzione e' disabilitata...", Page.User.Identity.Name, memLayer.ML.CRS("appName")));
+ string _rigaLog = String.Format("User {0}\t tried to force user - access disabled - he tried to log as \t {1}\\{2}", Page.User.Identity.Name, dominio.Text, user.Text);
+ SteamWare.logger.lg.scriviLog(_rigaLog, SteamWare.tipoLog.WARNING);
+ if (Login_Error != null)
+ {
+ Login_Error(this, new EventArgs());
+ }
+ }
+ }
+ else
+ {
+ lblMessage.Text = string.Format("{0}
user not authenticated!
", user_std.UtSn.Traduci("AccessFail"));
+ if (Login_Error != null)
+ {
+ Login_Error(this, new EventArgs());
+ }
+ string _rigaLog = String.Format("\t Someone tried to force user - real user: \t - not autenticated - \t tried to log as \t {0}\\{1}", dominio.Text, user.Text);
+ SteamWare.logger.lg.scriviLog(_rigaLog, SteamWare.tipoLog.WARNING);
+ }
+ }
+
+ protected void btnOk_Click(object sender, EventArgs e)
+ {
+ ForceUserIdentity();
+ }
+
+ #endregion
+
+ #endregion
+
+ #region area public
+
+ #region eventi pubblici esposti
+
+ public event EventHandler Login_ok;
+ public event EventHandler Login_Error;
+
+ #endregion
+
+ #region area proprietà
+
+ ///
+ /// modalità funzionamento controllo tra normale (ActiveDirectory e user auth di default) e forceUser
+ ///
+ public SteamWare.loginMode modoLogin
+ {
+ get
+ {
+ return _isForceUser;
+ }
+ set
+ {
+ _isForceUser = value;
+ }
+ }
+
+ #endregion
+
+
+ ///
+ /// avvio pagina
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ // procedo...
+ setLoginMode();
+ Session.RemoveAll();
+ if (_isForceUser == SteamWare.loginMode.normale)
+ {
+ bool cookieLogin = false;
+ if (memLayer.ML.confReadBool("enableCookie"))
+ {
+ cookieLogin = devicesAuthProxy.stObj.isAuth;// authProxy.tryAuthByCookie(memLayer.ML.confReadString("AuthCookie"));
+ }
+ if (!cookieLogin)
+ {
+ AdLogin();
+ }
+ else
+ {
+ if (Login_ok != null)
+ {
+ Login_ok(this, new EventArgs());
+ }
+ }
+ }
+ }
+
+ #endregion
+
+ }
}
\ No newline at end of file
diff --git a/C-TRACK/WebUserControls/mod_menuTopCompact.ascx.cs b/C-TRACK/WebUserControls/mod_menuTopCompact.ascx.cs
index ae2317c..b14d9dd 100644
--- a/C-TRACK/WebUserControls/mod_menuTopCompact.ascx.cs
+++ b/C-TRACK/WebUserControls/mod_menuTopCompact.ascx.cs
@@ -40,7 +40,7 @@ namespace C_TRACK.WebUserControls
{
Response.Redirect("~/login");
}
- lblTitolo.Text = memLayer.ML.confReadString("appName");
+ lblTitolo.Text = memLayer.ML.CRS("appName");
}
///
/// salva in variabile pagina il nome della pagina corrente
diff --git a/Jenkinsfile b/Jenkinsfile
index 573b4d6..234f319 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=103']) {
+ withEnv(['NEXT_BUILD_NUMBER=104']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'C.TRACK'