Attachment #115692 for bug #173717

View | Details | Raw Unified | Return to bug 173717
Collapse All | Expand All




        try:
            for line in fd:
                if line.startswith(prefix):
                    return self._check_userline(user, password, prefix,
                                                line[len(prefix):].rstrip('\n'))
        finally:
            fd.close()

    def userline(self, user, password):
        return self.prefix(user) + htpasswd(password)

    def _check_userline(self, user, password, prefix, suffix):
        return suffix == htpasswd(password, suffix)

    def _get_users(self, filename):

    def userline(self, user, password):
        return self.prefix(user) + htdigest(user, self.realm, password)

    def _check_userline(self, user, password, prefix, suffix):
        return suffix == htdigest(user, self.realm, password)

    def _get_users(self, filename):

Return to bug 173717

Lines 68-74 Link Here

(-)trac-accountmanager-svn-0.10/acct_mgr/htfile.py (-3 / +3 lines)
68	try:	68	try:
69	for line in fd:	69	for line in fd:
70	if line.startswith(prefix):	70	if line.startswith(prefix):
71	return self._check_userline(password, prefix,	71	return self._check_userline(user, password, prefix,
72	line[len(prefix):].rstrip('\n'))	72	line[len(prefix):].rstrip('\n'))
73	finally:	73	finally:
74	fd.close()	74	fd.close()
Lines 134-140 Link Here
134	def userline(self, user, password):	134	def userline(self, user, password):
135	return self.prefix(user) + htpasswd(password)	135	return self.prefix(user) + htpasswd(password)
136		136
137	def _check_userline(self, password, prefix, suffix):	137	def _check_userline(self, user, password, prefix, suffix):
138	return suffix == htpasswd(password, suffix)	138	return suffix == htpasswd(password, suffix)
139		139
140	def _get_users(self, filename):	140	def _get_users(self, filename):
Lines 172-178 Link Here
172	def userline(self, user, password):	172	def userline(self, user, password):
173	return self.prefix(user) + htdigest(user, self.realm, password)	173	return self.prefix(user) + htdigest(user, self.realm, password)
174		174
175	def _check_userline(self, password, prefix, suffix):	175	def _check_userline(self, user, password, prefix, suffix):
176	return suffix == htdigest(user, self.realm, password)	176	return suffix == htdigest(user, self.realm, password)
177		177
178	def _get_users(self, filename):	178	def _get_users(self, filename):