pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-05 20:53:13 +02:00
Code Activity

BUILD : 1.7.22 (1446) BUGS : NOTES : Removed password truncating and fixed a crashbug in enc_none. This build still crashes on CS GETPASS on some systems though. Someone take a look at termination of ci->founderpass pls.

Browse Source 
git-svn-id: svn://svn.anope.org/anope/trunk@1446 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1160 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
viper viper@31f1291d-b8d6-0310-a050-a5561fc1590b
2008-09-20 14:45:38 +00:00
parent 4f3f2b2cd4
commit 02f126c36e
24 changed files with 67 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changes
+1
View File
@@ -1,5 +1,6 @@
Anope Version S V N
--------------------
09/18 R Removed password truncating. [ #00]
09/15 F Dealt with the nss_dns.so.1 issue on freebsd 7. [ #00]
Anope Version 1.7.22
Changes.lang
+2
View File
@@ -1,10 +1,12 @@
Anope Version S V N
--------------------
*** New Strings:
PASSWORD_TOO_LONG
*** Mod Strings:
*** Del Strings:
PASSWORD_TRUNCATED
Anope Version 1.7.22
--------------------
lang/cat.l
+2 -2
View File
@@ -183,8 +183,8 @@ RAW_DISABLED
MORE_OBSCURE_PASSWORD
Per favor intenti novamente amb una clau mes oculta. Les claus han de ser de com a mínim 5 caràcters, no han de ser fàcils d'encertar (ex. Nom real o Nick), i no poden contenir el caràcter d'espai o tabulació.
PASSWORD_TRUNCATED
Noticia: La clau ha estat retallada a %d caracters.
PASSWORD_TOO_LONG
Your password is too long. Please try again with a shorter password.
NICK_NOT_REGISTERED
El teu nick no esta registrat.
lang/de.l
+2 -2
View File
@@ -205,8 +205,8 @@ MORE_OBSCURE_PASSWORD
nichts mit deinem Nicknamen zu tun haben. Weiterhin
kann keine Leer oder Tabulatortaste enthalten sein.
PASSWORD_TRUNCATED
Achtung: Dein Passwort wurde auf %d Zeichen gekürzt.
PASSWORD_TOO_LONG
Your password is too long. Please try again with a shorter password.
NICK_NOT_REGISTERED
Dein Nickname ist nicht registriert.
lang/en_us.l
+2 -2
View File
@@ -182,8 +182,8 @@ RAW_DISABLED
MORE_OBSCURE_PASSWORD
Please try again with a more obscure password. Passwords should be at least five characters long, should not be something easily guessed (e.g. your real name or your nick), and cannot contain the space or tab characters.
PASSWORD_TRUNCATED
Notice: Your password has been truncated to %d characters.
PASSWORD_TOO_LONG
Your password is too long. Please try again with a shorter password.
NICK_NOT_REGISTERED
Your nick isn't registered.
lang/es.l
+2 -2
View File
@@ -187,8 +187,8 @@ MORE_OBSCURE_PASSWORD
Las claves deben tener al menos 5 caracteres, no deben
ser algo facil de adivinar (ej. Nombre real o Nick),
y no pueden contener el caracter de espacio o tabulacion.
PASSWORD_TRUNCATED
Noticia: Tu clave ha sido reducida a %d caracteres.
PASSWORD_TOO_LONG
Your password is too long. Please try again with a shorter password.
NICK_NOT_REGISTERED
Tu nick no esta registrado.
lang/fr.l
+2 -2
View File
@@ -188,8 +188,8 @@ RAW_DISABLED
MORE_OBSCURE_PASSWORD
Veuillez réessayer avec un mot de passe plus difficile à trouver. Les mots de passe doivent contenir au moins cinq caractères, ne doivent pas être trop facilement devinables (par exemple votre vrai nom ou votre pseudo), et ne doit pas contenir d'espaces ou de tabulations.
PASSWORD_TRUNCATED
Note: Votre mot de passe a été tronqué à %d caractères.
PASSWORD_TOO_LONG
Your password is too long. Please try again with a shorter password.
NICK_NOT_REGISTERED
Votre pseudo n'est pas enregistré.
lang/gr.l
+2 -2
View File
@@ -182,8 +182,8 @@ RAW_DISABLED
MORE_OBSCURE_PASSWORD
Ðáñáêáëþ ðñïóðÜèçóå îáíÜ ìå Ýíáí ðéï ðïëýðëïêï êùäéêü. Ïé êùäéêïß ðñÝðåé íá åßíáé ôïõëÜ÷éóôïí Ýùò ðÝíôå ÷áñáêôÞñåò, íá ìçí åßíáé åýêïëïé íá ìáíôåõôïýí (ð.÷. ôï ðñáãìáôéêü ïíïìÜ óïõ Þ ôï øåõäþíõìï óïõ), êáé íá ìçí ðåñéÝ÷åé êåíü Þ äéÜöïðïõò Üëëïõò ÷áñáêôÞñåò.
PASSWORD_TRUNCATED
ÐáñáôÞñçóç: Ï êùäéêüò Ý÷åé ìåôáôñáðåß óå %d ÷áñáêôÞñåò.
PASSWORD_TOO_LONG
Your password is too long. Please try again with a shorter password.
NICK_NOT_REGISTERED
Áõôü ôï øåõäþíõìï äåí Ý÷åé êáôï÷õñùèåß.
lang/hun.l
+2 -2
View File
@@ -193,8 +193,8 @@ MORE_OBSCURE_PASSWORD
Próbálj nehezebb jelszót használni .Jelszavad min. öt
karakter legyen, és nem kitalálható legyen, (ne a
nickneved/valósneved), ne legyen benne írásjel.
PASSWORD_TRUNCATED
Megjegyzés: A jelszavad %d karakter hosszúságúra lett csonkítva.
PASSWORD_TOO_LONG
Your password is too long. Please try again with a shorter password.
NICK_NOT_REGISTERED
A neved még nem regisztrált.
NICK_NOT_REGISTERED_HELP
lang/it.l
+2 -2
View File
@@ -184,8 +184,8 @@ RAW_DISABLED
MORE_OBSCURE_PASSWORD
Per favore, prova di nuovo con una password più oscura. Le password devono essere lunghe almeno 5 caratteri, non devono essere indovinate facilmente (ad es. il proprio nome o nick), e non possono contenere i caratteri di spazio e di tabulazione.
PASSWORD_TRUNCATED
Nota: La tua password è stata troncata a %d caratteri.
PASSWORD_TOO_LONG
Your password is too long. Please try again with a shorter password.
NICK_NOT_REGISTERED
Il tuo nick non è registrato.
lang/nl.l
+2 -2
View File
@@ -185,8 +185,8 @@ RAW_DISABLED
MORE_OBSCURE_PASSWORD
Probeer aub opnieuw met een onduidelijker wachtwoord. Wachtwoorden moeten tenminste 5 tekens lang zijn, niet iets makkelijk raadbaars (bijv. je echte naam of je nick), en kan geen tab of spatie bevatten.
PASSWORD_TRUNCATED
Let op: Je wachtwoord is ingekort tot %d tekens.
PASSWORD_TOO_LONG
Je wachtwoord is te lang. Probeer het opnieuw met een korter wachtwoord.
NICK_NOT_REGISTERED
Je nick is niet geregistreerd.
lang/pl.l
+2 -3
View File
@@ -199,9 +199,8 @@ MORE_OBSCURE_PASSWORD
Proszê spróbowaæ ponownie z trudniejszym has³em.
Has³o powinno mieæ minimum 5 znaków oraz powinno
zawieraæ cyfry i litery.
PASSWORD_TRUNCATED
Informacja: Twoje has³o zosta³o skrócone
do %d znaków.
PASSWORD_TOO_LONG
Your password is too long. Please try again with a shorter password.
NICK_NOT_REGISTERED
Twój nick jest niezarejestrowany.
lang/pt.l
+2 -2
View File
@@ -192,8 +192,8 @@ RAW_DISABLED
MORE_OBSCURE_PASSWORD
Por favor tente novamente com uma senha mais difícil. Não use TAB ou espaços.
PASSWORD_TRUNCATED
Atenção: Sua senha foi reduzida a %d caracteres.
PASSWORD_TOO_LONG
Your password is too long. Please try again with a shorter password.
NICK_NOT_REGISTERED
Seu nick não está registrado.
lang/ru.l
+2 -2
View File
@@ -188,8 +188,8 @@ RAW_DISABLED
MORE_OBSCURE_PASSWORD
Ïîæàëóéñòà, ïîïðîáóéòå ñíîâà ñ áîëåå ñëîæíûì ïàðîëåì. Ïàðîëü äîëæåí èìåòü äëèíó íå ìåíåå 5 ñèìâîëîâ, ñîñòîÿòü òîëüêî èç ëàòèíñêèõ áóêâ èëè öèôð, íå áûòü ëåãêî îòãàäûâàåìûì (ò.å. Âàøèì èìåíåì èëè Âàøèì íèêîì), è íå äîëæåí ñîäåðæàòü ïðîáåëîâ è òàáóëÿöèé.
PASSWORD_TRUNCATED
Ïðèìå÷àíèå: Âàø ïàðîëü áûë óñå÷åí äî %d ñèìâîëîâ.
PASSWORD_TOO_LONG
Your password is too long. Please try again with a shorter password.
NICK_NOT_REGISTERED
Âàø íèê íå çàðåãèñòðèðîâàí.
lang/tr.l
+2 -2
View File
@@ -186,8 +186,8 @@ RAW_DISABLED
MORE_OBSCURE_PASSWORD
Lütfen daha zor bir þifre deneyin. Þifreler en az 5 karakter uzunlukta, kolayca tahmin edilemeyecek birþey olmalýdýr(ör: gerçek isminiz, nickiniz v.b. olmamalýdýr), ve boþlukla tab kullanýlmamalýdýr.
PASSWORD_TRUNCATED
Uyarý: Þifreniz %d karaktere kadar kýsaltýldý.
PASSWORD_TOO_LONG
Your password is too long. Please try again with a shorter password.
NICK_NOT_REGISTERED
Nickiniz kayýtlý deðil.
src/core/cs_getpass.c
+5 -5
View File
@@ -84,7 +84,7 @@ int do_getpass(User * u)
} else if (CSRestrictGetPass && !is_services_root(u)) {
notice_lang(s_ChanServ, u, PERMISSION_DENIED);
} else {
if(enc_decrypt(ci->founderpass,tmp_pass,PASSMAX)==1) {
if(enc_decrypt(ci->founderpass,tmp_pass,PASSMAX)==1) {
alog("%s: %s!%s@%s used GETPASS on %s",
s_ChanServ, u->nick, u->username, u->host, ci->name);
if (WallGetpass) {
@@ -93,10 +93,10 @@ int do_getpass(User * u)
u->nick, chan);
}
notice_lang(s_ChanServ, u, CHAN_GETPASS_PASSWORD_IS,
chan, ci->founderpass);
} else {
notice_lang(s_ChanServ, u, CHAN_GETPASS_UNAVAILABLE);
}
chan, tmp_pass);
} else {
notice_lang(s_ChanServ, u, CHAN_GETPASS_UNAVAILABLE);
}
}
return MOD_CONT;
}
src/core/cs_register.c
+9 -10
View File
@@ -118,14 +118,14 @@ int do_register(User * u)
} else if (!is_servadmin && nc->channelmax > 0
&& nc->channelcount >= nc->channelmax) {
notice_lang(s_ChanServ, u,
nc->channelcount >
nc->
channelmax ? CHAN_EXCEEDED_CHANNEL_LIMIT :
notice_lang(s_ChanServ, u, nc->channelcount >
nc->channelmax ? CHAN_EXCEEDED_CHANNEL_LIMIT :
CHAN_REACHED_CHANNEL_LIMIT, nc->channelmax);
} else if (stricmp(u->nick, pass) == 0
|| (StrictPasswords && strlen(pass) < 5)) {
notice_lang(s_ChanServ, u, MORE_OBSCURE_PASSWORD);
} else if(enc_encrypt_check_len(strlen(pass) ,PASSMAX)) {
notice_lang(s_ChanServ, u, PASSWORD_TOO_LONG);
} else if (!(ci = makechan(chan))) {
alog("%s: makechan() failed for REGISTER %s", s_ChanServ, chan);
notice_lang(s_ChanServ, u, CHAN_REGISTRATION_FAILED);
@@ -145,8 +145,7 @@ int do_register(User * u)
ci->memos.memomax = MSMaxMemos;
ci->last_used = ci->time_registered;
ci->founder = nc;
if (strlen(pass) > PASSMAX)
notice_lang(s_ChanServ, u, PASSWORD_TRUNCATED, PASSMAX);
memset(pass, 0, strlen(pass));
memcpy(ci->founderpass, founderpass, PASSMAX);
ci->desc = sstrdup(desc);
@@ -164,10 +163,10 @@ int do_register(User * u)
alog("%s: Channel '%s' registered by %s!%s@%s", s_ChanServ, chan,
u->nick, u->username, u->host);
notice_lang(s_ChanServ, u, CHAN_REGISTERED, chan, u->nick);
if(enc_decrypt(ci->founderpass,tmp_pass,PASSMAX) == 1) {
notice_lang(s_ChanServ, u, CHAN_PASSWORD_IS, ci->founderpass);
}
if(enc_decrypt(ci->founderpass,tmp_pass,PASSMAX) == 1) {
notice_lang(s_ChanServ, u, CHAN_PASSWORD_IS, tmp_pass);
}
uc = scalloc(sizeof(*uc), 1);
uc->next = u->founder_chans;
src/core/cs_set.c
+3 -4
View File
@@ -373,10 +373,9 @@ int do_set_password(User * u, ChannelInfo * ci, char *param)
return MOD_CONT;
}
if (len > PASSMAX) {
len = PASSMAX;
param[len] = 0;
notice_lang(s_ChanServ, u, PASSWORD_TRUNCATED, PASSMAX);
if (enc_encrypt_check_len(len ,PASSMAX)) {
notice_lang(s_ChanServ, u, PASSWORD_TOO_LONG);
return MOD_CONT;
}
if (enc_encrypt(param, len, ci->founderpass, PASSMAX) < 0) {
src/core/enc_none.c
+2 -1
View File
@@ -61,8 +61,9 @@ int plain_encrypt_check_len(int passlen, int bufsize) {
}
int plain_decrypt(const char *src, char *dest, int size) {
memset(dest,0,size+1);
memset(dest,0,size);
strncpy(dest,src,size);
dest[size] = '\0';
return 1;
}
src/core/ns_getpass.c
+4 -4
View File
@@ -96,17 +96,17 @@ int do_getpass(User * u)
} else if (NSRestrictGetPass && !is_services_root(u)) {
notice_lang(s_NickServ, u, PERMISSION_DENIED);
} else {
if(enc_decrypt(na->nc->pass,tmp_pass,PASSMAX)==1) {
if(enc_decrypt(na->nc->pass,tmp_pass,PASSMAX)==1) {
alog("%s: %s!%s@%s used GETPASS on %s", s_NickServ, u->nick,
u->username, u->host, nick);
if (WallGetpass)
anope_cmd_global(s_NickServ, "\2%s\2 used GETPASS on \2%s\2",
u->nick, nick);
notice_lang(s_NickServ, u, NICK_GETPASS_PASSWORD_IS, nick,
na->nc->pass);
} else {
tmp_pass);
} else {
notice_lang(s_NickServ, u, NICK_GETPASS_UNAVAILABLE);
}
}
}
return MOD_CONT;
}
src/core/ns_register.c
+2 -4
View File
@@ -185,13 +185,11 @@ int do_register(User * u)
} else if (stricmp(u->nick, pass) == 0
|| (StrictPasswords && strlen(pass) < 5)) {
notice_lang(s_NickServ, u, MORE_OBSCURE_PASSWORD);
} else if (enc_encrypt_check_len(strlen(pass), PASSMAX)) {
notice_lang(s_NickServ, u, PASSWORD_TOO_LONG);
} else if (email && !MailValidate(email)) {
notice_lang(s_NickServ, u, MAIL_X_INVALID, email);
} else {
if (strlen(pass) > PASSMAX) {
pass[PASSMAX] = '\0';
notice_lang(s_NickServ, u, PASSWORD_TRUNCATED, PASSMAX);
}
for (idx = 0; idx < 9; idx++) {
passcode[idx] =
chars[(1 +
src/core/ns_saset.c
+4 -7
View File
@@ -235,12 +235,9 @@ int do_saset_password(User * u, NickCore * nc, char *param)
|| (StrictPasswords && len < 5)) {
notice_lang(s_NickServ, u, MORE_OBSCURE_PASSWORD);
return MOD_CONT;
}
if (len > PASSMAX) {
len = PASSMAX;
param[len] = 0;
notice_lang(s_NickServ, u, PASSWORD_TRUNCATED, PASSMAX);
} else if (enc_encrypt_check_len(len ,PASSMAX)) {
notice_lang(s_NickServ, u, PASSWORD_TOO_LONG);
return MOD_CONT;
}
if (nc->pass)
@@ -261,7 +258,7 @@ int do_saset_password(User * u, NickCore * nc, char *param)
if(enc_decrypt(nc->pass,tmp_pass,PASSMAX)==1) {
notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_CHANGED_TO, nc->display,
nc->pass);
tmp_pass);
} else {
notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_CHANGED, nc->display);
}
src/core/ns_set.c
+4 -7
View File
@@ -208,12 +208,9 @@ int do_set_password(User * u, NickCore * nc, char *param)
if (stricmp(nc->display, param) == 0 || (StrictPasswords && len < 5)) {
notice_lang(s_NickServ, u, MORE_OBSCURE_PASSWORD);
return MOD_CONT;
}
if (len > PASSMAX) {
len = PASSMAX;
param[len] = 0;
notice_lang(s_NickServ, u, PASSWORD_TRUNCATED, PASSMAX);
} else if (enc_encrypt_check_len(len ,PASSMAX)) {
notice_lang(s_NickServ, u, PASSWORD_TOO_LONG);
return MOD_CONT;
}
if (nc->pass)
@@ -232,7 +229,7 @@ int do_set_password(User * u, NickCore * nc, char *param)
memset(param, 0, len);
if(enc_decrypt(nc->pass,tmp_pass,PASSMAX)==1) {
notice_lang(s_NickServ, u, NICK_SET_PASSWORD_CHANGED_TO, nc->pass);
notice_lang(s_NickServ, u, NICK_SET_PASSWORD_CHANGED_TO, tmp_pass);
} else {
notice_lang(s_NickServ, u, NICK_SET_PASSWORD_CHANGED);
}
version.log
+5 -1
View File
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="22"
VERSION_EXTRA="-svn"
VERSION_BUILD="1445"
VERSION_BUILD="1446"
# $Log$
#
# BUILD : 1.7.22 (1446)
# BUGS :
# NOTES : Removed password truncating and fixed a crashbug in enc_none. This build still crashes on CS GETPASS on some systems though. Someone take a look at termination of ci->founderpass pls.
#
# BUILD : 1.7.22 (1445)
# BUGS :
# NOTES : Added missing entries for .22 release to Changes.lang.