kallithea Changeset - be15cc83361c

Changeset - be15cc83361c

Parent rev.

Child rev.

[Not reviewed]

Merge beta

0 3 0

Marcin Kuzminski - 15 years ago 2010-12-02 03:52:26
marcin@python-works.com

merge

3 files changed with 11 insertions and 10 deletions:

rhodecode/lib/auth_ldap.py

rhodecode/public/css/style.css

rhodecode/templates/index.html

0 comments (0 inline, 0 general)

rhodecode/lib/auth_ldap.py

➞

Show inline comments

@@ @@ -37,69 +37,68 @@ class AuthLdap(object): @@
     def __init__(self, server, base_dn, port=389, bind_dn='', bind_pass='',
                  use_ldaps=False, ldap_version=3):
         self.ldap_version = ldap_version
         if use_ldaps:
             port = port or 689
         self.LDAP_USE_LDAPS = use_ldaps
         self.LDAP_SERVER_ADDRESS = server
         self.LDAP_SERVER_PORT = port
         #USE FOR READ ONLY BIND TO LDAP SERVER
         self.LDAP_BIND_DN = bind_dn
         self.LDAP_BIND_PASS = bind_pass
         ldap_server_type = 'ldap'
         if self.LDAP_USE_LDAPS:ldap_server_type = ldap_server_type + 's'
         self.LDAP_SERVER = "%s://%s:%s" % (ldap_server_type,
                                                self.LDAP_SERVER_ADDRESS,
                                                self.LDAP_SERVER_PORT)
         self.BASE_DN = base_dn
     def authenticate_ldap(self, username, password):
         """Authenticate a user via LDAP and return his/her LDAP properties.
         Raises AuthenticationError if the credentials are rejected, or
         EnvironmentError if the LDAP server can't be reached.
         :param username: username
         :param password: password
         """
         from rhodecode.lib.helpers import chop_at
         uid = chop_at(username, "@%s" % self.LDAP_SERVER_ADDRESS)
         if "," in username:
             raise LdapUsernameError("invalid character in username: ,")
         try:
             ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, '/etc/openldap/cacerts')
             ldap.set_option(ldap.OPT_NETWORK_TIMEOUT, 10)
             server = ldap.initialize(self.LDAP_SERVER)
             if self.ldap_version == 2:
                 server.protocol = ldap.VERSION2
             else:
                 server.protocol = ldap.VERSION3
             if self.LDAP_BIND_DN and self.LDAP_BIND_PASS:
                 login_dn = self.BASE_DN % {'user':uid}
                 server.simple_bind_s(login_dn, self.LDAP_BIND_PASS)
                 server.simple_bind_s(self.LDAP_BIND_DN, self.LDAP_BIND_PASS)
             dn = self.BASE_DN % {'user':uid}
             log.debug("Authenticating %r at %s", dn, self.LDAP_SERVER)
             server.simple_bind_s(dn, password)
             properties = server.search_s(dn, ldap.SCOPE_SUBTREE)
             if not properties:
                 raise ldap.NO_SUCH_OBJECT()
         except ldap.NO_SUCH_OBJECT, e:
             log.debug("LDAP says no such user '%s' (%s)", uid, username)
             raise LdapUsernameError()
         except ldap.INVALID_CREDENTIALS, e:
             log.debug("LDAP rejected password for user '%s' (%s)", uid, username)
             raise LdapPasswordError()
         except ldap.SERVER_DOWN, e:
             raise LdapConnectionError("LDAP can't access authentication server")
         return properties[0]

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -1360,97 +1360,97 @@ margin:10px 0 0; @@
 padding:0 0 2px;
+}
 #register div.title {
 clear:both;
 overflow:hidden;
 position:relative;
 background:#003367 url("../images/header_inner.png") repeat-x;
 margin:0 auto;
 padding:0;
+}
 #register div.inner {
 background:#FFF;
 border-top:none;
 border-bottom:none;
 margin:0 auto;
 padding:20px;
+}
 #register div.form div.fields div.field div.label {
 width:135px;
 float:left;
 text-align:right;
 margin:2px 10px 0 0;
 padding:5px 0 0 5px;
+}
 #register div.form div.fields div.field div.input input {
 width:300px;
 background:#FFF;
 border-top:1px solid #b3b3b3;
 border-left:1px solid #b3b3b3;
 border-right:1px solid #eaeaea;
 border-bottom:1px solid #eaeaea;
 color:#000;
 font-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 font-size:11px;
 margin:0;
 padding:7px 7px 6px;
+}
 #register div.form div.fields div.buttons {
 clear:both;
 overflow:hidden;
 border-top:1px solid #DDD;
 text-align:left;
 margin:0;
-padding:10px 0 0 114px;
+padding:10px 0 0 150px;
+}
 #register div.form div.fields div.buttons div.highlight input.ui-state-default {
 background:url("../images/button_highlight.png") repeat-x scroll 0 0 #4E85BB;
 color:#FFF;
 border-color:#5C91A4 #2B7089 #1A6480 #2A6F89;
 border-style:solid;
 border-width:1px;
+}
 #register div.form div.activation_msg {
 padding-top:4px;
 padding-bottom:4px;
+}
 .trending_language_tbl,.trending_language_tbl td {
 border:0 !important;
 margin:0 !important;
 padding:0 !important;
+}
 .trending_language {
 background-color:#003367;
 color:#FFF;
 display:block;
 min-width:20px;
 text-decoration:none;
 height:12px;
 margin-bottom:4px;
 margin-left:5px;
 white-space:pre;
 padding:3px;
+}
 h3.files_location {
 font-size:1.8em;
 font-weight:700;
 border-bottom:none !important;
 margin:10px 0 !important;
+}
 #files_data dl dt {
 float:left;
 width:115px;
 margin:0 !important;
 padding:5px;
+}

rhodecode/templates/index.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="base/base.html"/>
 <%def name="title()">
     ${_('Dashboard')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs()">
 	${c.rhodecode_name}
 </%def>
 <%def name="page_nav()">
 	${self.menu('home')}
 </%def>
 <%def name="main()">
 	<%def name="get_sort(name)">
 		<%name_slug = name.lower().replace(' ','_') %>
 		%if name_slug == c.sort_slug:
 		  %if c.sort_by.startswith('-'):
 		    <a href="?sort=${name_slug}">${name}&uarr;</a>
 		  %else:
 		    <a href="?sort=-${name_slug}">${name}&darr;</a>
 		  %endif:
 		%else:
 		    <a href="?sort=${name_slug}">${name}</a>
 		%endif
 	</%def>
     <div class="box">
 	    <!-- box / title -->
 	    <div class="title">
 	        <h5>${_('Dashboard')}
 	        <input class="top-right-rounded-corner top-left-rounded-corner bottom-left-rounded-corner bottom-right-rounded-corner" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
 	        </h5>
 	        %if h.HasPermissionAny('hg.admin','hg.create.repository')():
 	        <ul class="links">
 	          <li>
 	            <span>${h.link_to(_('ADD NEW REPOSITORY'),h.url('admin_settings_create_repository'))}</span>
 	          </li>
 	        </ul>
 	        %endif
 	        %if c.rhodecode_user.username != 'default':
 		        %if h.HasPermissionAny('hg.admin','hg.create.repository')():
 		        <ul class="links">
 		          <li>
 		            <span>${h.link_to(_('ADD NEW REPOSITORY'),h.url('admin_settings_create_repository'))}</span>
 		          </li>
 		        </ul>
 		        %endif
 		    %endif
 	    </div>
 	    <!-- end box / title -->
         <div class="table">
             <table>
             <thead>
 	            <tr>
 			        <th class="left">${get_sort(_('Name'))}</th>
 			        <th class="left">${get_sort(_('Description'))}</th>
 			        <th class="left">${get_sort(_('Last change'))}</th>
 			        <th class="left">${get_sort(_('Tip'))}</th>
 			        <th class="left">${get_sort(_('Owner'))}</th>
 			        <th class="left">${_('RSS')}</th>
 			        <th class="left">${_('Atom')}</th>
 	            </tr>
             </thead>
             <tbody>
 		    %for cnt,repo in enumerate(c.repos_list):
 		        <tr class="parity${cnt%2}">
 		            <td>
 		            <div style="white-space: nowrap">
 		             ## TYPE OF REPO
 		             %if repo['repo'].dbrepo.repo_type =='hg':
 		               <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="/images/icons/hgicon.png"/>
 		             %elif repo['repo'].dbrepo.repo_type =='git':
 		               <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="/images/icons/giticon.png"/>
 		             %else:
 		             %endif
 		             ##PRIVATE/PUBLIC
 		             %if repo['repo'].dbrepo.private:
 		                <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="/images/icons/lock.png"/>
 		             %else:
 		                <img class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="/images/icons/lock_open.png"/>
 		             %endif
 		            ##NAME
 		            ${h.link_to(repo['name'],
 		                h.url('summary_home',repo_name=repo['name']),class_="repo_name")}
 		            %if repo['repo'].dbrepo.fork:
 		            	<a href="${h.url('summary_home',repo_name=repo['repo'].dbrepo.fork.repo_name)}">
 		            	<img class="icon" alt="${_('fork')}"
 		            	title="${_('Fork of')} ${repo['repo'].dbrepo.fork.repo_name}"
 		            	src="/images/icons/arrow_divide.png"/></a>
 		            %endif
 		            </div>
 		            </td>
 		            ##DESCRIPTION

0 comments (0 inline, 0 general)