rhodecode-enterprise-ce Pull Request !2275

Closed

Pull request !2275 Created on by

csalgau

Issue #5536 - ability to disable server-side SSH key generation

Commit flow:

branch:default of u/csalgau/rhodecode-enterprise-ce-csalgau-drop → branch:default of rhodecode-enterprise-ce

Versions:

Pull request versions not available.

Collapse 3 commits

ver	Time	Author	Commit	Description
`latest`	Wed, 13 Feb 2019 23:16:57	csalgau	`r3208:7d47a18b6391`	Issue #5536 - another template typo
`v2`	Wed, 13 Feb 2019 21:51:03	csalgau	`r3207:55f6d5276de9`	Issue #5536 - template typo. also make variable names more explicit
`v1`	Wed, 13 Feb 2019 20:05:00	csalgau	`r3206:c02cc55651b4`	Issue #5536 - ability to disable server-side SSH key generation
3 commits hidden, click expand to show them.

Collapse all files

rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako

1 +1 -1

                             % endif
                             ${_('Confirmation required on the next screen')}.
                         </p>
-                    % elif:
+                    % else:
                
                    
                
                
            


        

    

      

  

      
          

              

                      
                          
                          todo
                      

              
          
          
              
  

  
    
  
  

  

    
        marcink
    
  

          

          
              Wed, 13 Feb 2019 23:24:45
          


          

              
                
              

          

                    
                        outdated v2
                        |
                    

            
              
              

                
                    Comment #21564
                    
                

                    
                    
                      Edit
                    
                    
                      Delete
                    
              
            

            |
                  
                 

          
      
      
          Actually Jenkins is right :D elif needs a condition too. I believe this should be %else
      

  

        

    

      

  

      
          

              

                    
                        fix
                        
                            #21564
                        
                    

              
          
          
              
  

  
    
  
  

  

    
        csalgau
    
  

          

          
              Thu, 14 Feb 2019 00:18:09
          

            
            author
            

          

              
                
              

          

                    
                    

            
              
              

                
                    Comment #21566
                    
                

                    
                    
                      Edit
                    
                    
                      Delete
                    
              
            

            |
                 
                 

          
      
      
          I did have that fixed on the live template. I just didn't sync it.
                         <h2>
                             ${_('SSH key generator has been disabled.')}
            


        

    

      

  

      
          

              

                    
                        
                        note
                    

              
          
          
              
  

  
    
  
  

  

    
        marcink
    
  

          

          
              Wed, 13 Feb 2019 21:32:13
          


          

              
                
              

          

                    
                        outdated v1
                        |
                    

            
              
              

                
                    Comment #21546
                    
                

                    
                    
                      Edit
                    
                    
                      Delete
                    
              
            

            |
                  
                 

          
      
      
          I wonder if we should put here a link for users with example key generation ?
ssh-keygen -t rsa -b 4096 -C "your_email@example.com"

      

  

        

    

      

  

      
          

              

                    
                        
                        note
                    

              
          
          
              
  

  
    
  
  

  

    
        csalgau
    
  

          

          
              Wed, 13 Feb 2019 22:21:39
          

            
            author
            

          

              
                
              

          

                    
                        outdated v1
                        |
                    

            
              
              

                
                    Comment #21550
                    
                

                    
                    
                      Edit
                    
                    
                      Delete
                    
              
            

            |
                  
                 

          
      
      
          In theory, users shouldn't be able to see this string without pasting or manually adding /generate in their URL. I think having the endpoint fail nicely is better than 404-ing.

Unless you're going for easter eggs on hidden URL, I would rather suggest adding instructions to the main key management page.
      

  

        

    

      

  

      
          

              

                    
                        
                        note
                    

              
          
          
              
  

  
    
  
  

  

    
        marcink
    
  

          

          
              Wed, 13 Feb 2019 22:24:15
          


          

              
                
              

          

                    
                        outdated v1
                        |
                    

            
              
              

                
                    Comment #21551
                    
                

                    
                    
                      Edit
                    
                    
                      Delete
                    
              
            

            |
                  
                 

          
      
      
          Right, this is the generate page, missed that. Yes this makes sense.
                         </h2>

rhodecode/tests/rhodecode.ini unresolved comments ¶ 0

	This file was removed from diff during updates to this pull-request. There are still outdated/unresolved comments attached to it.
					note marcink Wed, 13 Feb 2019 21:30:46 outdated `v1` `\|` Comment #21545 Edit Delete `\|` Just a proposal not a big deal to make it more explicit. Maybe ssh.enable_ui_key_generator ?

rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako unresolved comments ¶ 0

	This file was removed from diff during updates to this pull-request. There are still outdated/unresolved comments attached to it.
					note marcink Wed, 13 Feb 2019 21:32:13 outdated `v1` `\|` Comment #21546 Edit Delete `\|` I wonder if we should put here a link for users with example key generation ? `ssh-keygen -t rsa -b 4096 -C "your_email@example.com"` note csalgau Wed, 13 Feb 2019 22:21:39 author outdated `v1` `\|` Comment #21550 Edit Delete `\|` In theory, users shouldn't be able to see this string without pasting or manually adding /generate in their URL. I think having the endpoint fail nicely is better than 404-ing. Unless you're going for easter eggs on hidden URL, I would rather suggest adding instructions to the main key management page. note marcink Wed, 13 Feb 2019 22:24:15 outdated `v1` `\|` Comment #21551 Edit Delete `\|` Right, this is the generate page, missed that. Yes this makes sense. todo marcink Wed, 13 Feb 2019 23:24:45 outdated `v2` `\|` Comment #21564 Edit Delete `\|` Actually Jenkins is right :D elif needs a condition too. I believe this should be %else fix #21564 csalgau Thu, 14 Feb 2019 00:18:09 author Comment #21566 Edit Delete `\|` I did have that fixed on the live template. I just didn't sync it.

rhodecode/templates/admin/my_account/my_account_ssh_keys.mako unresolved comments ¶ 0

	This file was removed from diff during updates to this pull-request. There are still outdated/unresolved comments attached to it.
					note marcink Wed, 13 Feb 2019 21:33:13 `v1` `\|` Comment #21547 Edit Delete `\|` +1 for spelling fix ;) todo marcink Wed, 13 Feb 2019 22:28:02 outdated `v1` `\|` Comment #21554 Edit Delete `\|` While jenkins tests this and shows the error, i'll point out that this `endif` generates syntax error. Should be `% endif` note csalgau Wed, 13 Feb 2019 22:30:37 author outdated `v1` `\|` Comment #21555 Edit Delete `\|` indeed I goofed on that. I'm working with a convoluted docker on windows setup and diffing things manually. fix #21554 csalgau Wed, 13 Feb 2019 22:52:29 author `v2` `\|` Comment #21558 Edit Delete `\|` fixed in r3207

Expand all files

configs/development.ini

0 +2 -2

             ssh.executable.git = ~/.rccontrol/vcsserver-1/profile/bin/git
             ssh.executable.svn = ~/.rccontrol/vcsserver-1/profile/bin/svnserve
-            ## Enables SSH Key generator web interface. Disabling this still allows users
+            ## Enables SSH key generator web interface. Disabling this still allows users
             ## to add their own keys.
-            ssh.enable_generator = true
+            ssh.enable_ui_key_generator = true
             ## Dummy marker to add new entries after.

configs/production.ini

0 +2 -2

             ssh.executable.git = ~/.rccontrol/vcsserver-1/profile/bin/git
             ssh.executable.svn = ~/.rccontrol/vcsserver-1/profile/bin/svnserve
-            ## Enables SSH Key generator web interface. Disabling this still allows users
+            ## Enables SSH key generator web interface. Disabling this still allows users
             ## to add their own keys.
-            ssh.enable_generator = true
+            ssh.enable_ui_key_generator = true
             ## Dummy marker to add new entries after.

docs/auth/ssh-connection.rst

0 +2 -2

                     ssh.executable.git = ~/.rccontrol/vcsserver-1/profile/bin/git
                     ssh.executable.svn = ~/.rccontrol/vcsserver-1/profile/bin/svnserve
-                    ## Enables SSH Key generator web interface. Disabling this still allows users
+                    ## Enables SSH key generator web interface. Disabling this still allows users
                     ## to add their own keys.
-                    ssh.enable_generator = true
+                    ssh.enable_ui_key_generator = true
 . Set base_url for instance to enable proper event handling (Optional):

rhodecode/apps/my_account/views/my_account_ssh_keys.py

0 +1 -1

                     c = self.load_default_context()
                     c.active = 'ssh_keys_generate'
-                    if c.ssh_generator_enabled:
+                    if c.ssh_key_generator_enabled:
                         comment = 'RhodeCode-SSH {}'.format(c.user.email or '')
                         c.private, c.public = SshKeyModel().generate_keypair(comment=comment)
                         c.target_form_url = h.route_path(

rhodecode/apps/ssh_support/__init__.py

0 +1 -1

                 _bool_setting(settings, config_keys.generate_authorized_keyfile, 'false')
                 _bool_setting(settings, config_keys.wrapper_allow_shell, 'false')
                 _bool_setting(settings, config_keys.enable_debug_logging, 'false')
-                _bool_setting(settings, config_keys.ssh_generator_enabled, 'true')
+                _bool_setting(settings, config_keys.ssh_key_generator_enabled, 'true')
                 _string_setting(settings, config_keys.authorized_keys_file_path,
                                 '~/.ssh/authorized_keys_rhodecode',

rhodecode/apps/ssh_support/config_keys.py

0 +1 -1

             generate_authorized_keyfile = 'ssh.generate_authorized_keyfile'
             authorized_keys_file_path = 'ssh.authorized_keys_file_path'
             authorized_keys_line_ssh_opts = 'ssh.authorized_keys_ssh_opts'
-            ssh_generator_enabled = 'ssh.enable_generator'
+            ssh_key_generator_enabled = 'ssh.enable_ui_key_generator'
             wrapper_cmd = 'ssh.wrapper_cmd'
             wrapper_allow_shell = 'ssh.wrapper_cmd_allow_shell'
             enable_debug_logging = 'ssh.enable_debug_logging'

rhodecode/lib/base.py

0 +2 -2

                     config.get('labs_settings_active', 'false'))
                 context.ssh_enabled = str2bool(
                     config.get('ssh.generate_authorized_keyfile', 'false'))
-                context.ssh_generator_enabled = str2bool(
+                context.ssh_key_generator_enabled = str2bool(
-                    config.get('ssh.enable_generator', 'true'))
+                    config.get('ssh.enable_ui_key_generator', 'true'))
                 context.visual.allow_repo_location_change = str2bool(
                     config.get('allow_repo_location_change', True))

rhodecode/templates/admin/my_account/my_account_ssh_keys.mako

2 +2 -2

                                     </div>
                                     <div class="input">
                                         ${h.text('description', class_='medium', placeholder=_('Description'))}
-                                        % if c.ssh_generator_enabled:
+                                        % if c.ssh_key_generator_enabled:
                                             <a href="${h.route_path('my_account_ssh_keys_generate')}">${_('Generate random RSA key')}</a>
-                                        $ endif
+                                        % endif
                
                    
                
                
            


        

    

      

  

      
          

              

                      
                          
                          todo
                      

              
          
          
              
  

  
    
  
  

  

    
        marcink
    
  

          

          
              Wed, 13 Feb 2019 22:28:02
          


          

              
                
              

          

                    
                        outdated v1
                        |
                    

            
              
              

                
                    Comment #21554
                    
                

                    
                    
                      Edit
                    
                    
                      Delete
                    
              
            

            |
                  
                 

          
      
      
          While jenkins tests this and shows the error, i'll point out that this endif generates syntax error. Should be % endif
      

  

        

    

      

  

      
          

              

                    
                        
                        note
                    

              
          
          
              
  

  
    
  
  

  

    
        csalgau
    
  

          

          
              Wed, 13 Feb 2019 22:30:37
          

            
            author
            

          

              
                
              

          

                    
                        outdated v1
                        |
                    

            
              
              

                
                    Comment #21555
                    
                

                    
                    
                      Edit
                    
                    
                      Delete
                    
              
            

            |
                  
                 

          
      
      
          indeed I goofed on that. I'm working with a convoluted docker on windows setup and diffing things manually.
      

  

        

    

      

  

      
          

              

                    
                        fix
                        
                            #21554
                        
                    

              
          
          
              
  

  
    
  
  

  

    
        csalgau
    
  

          

          
              Wed, 13 Feb 2019 22:52:29
          

            
            author
            

          

              
                
              

          

                    
                        v2
                        |
                    

            
              
              

                
                    Comment #21558
                    
                

                    
                    
                      Edit
                    
                    
                      Delete
                    
              
            

            |
                 
                 

          
      
      
          fixed in r3207
                                     </div>
                                  </div>
                         note
                    

              
          
          
              
  

  
    
  
  

  

    
        marcink
    
  

          

          
              Wed, 13 Feb 2019 21:33:13
          


          

              
                
              

          

                    
                        v1
                        |
                    

            
              
              

                
                    Comment #21547
                    
                

                    
                    
                      Edit
                    
                    
                      Delete
                    
              
            

            |
                 
                 

          
      
      
          +1 for spelling fix ;)

rhodecode/templates/admin/users/user_edit_ssh_keys.mako

0 +1 -1

                                     </div>
                                     <div class="input">
                                         ${h.text('description', class_='medium', placeholder=_('Description'))}
-                                        % if c.ssh_generator_enabled:
+                                        % if c.ssh_key_generator_enabled:
                                             <a href="${h.route_path('edit_user_ssh_keys_generate_keypair', user_id=c.user.user_id)}">${_('Generate random RSA key')}</a>
                                         % endif
                                     </div>

rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako

0 +1 -1

                      <h3 class="panel-title">${_('New SSH Key generation')}</h3>
                 </div>
                 <div class="panel-body">
-                    %if c.ssh_enabled and c.ssh_generator_enabled:
+                    %if c.ssh_enabled and c.ssh_key_generator_enabled:
                         <p>
                             ${_('Below is a 2048 bit generated SSH RSA key. You can use it to access RhodeCode via the SSH wrapper.')}
                         </p>

rhodecode/tests/rhodecode.ini

0 +2 -2

             ssh.executable.git = ~/.rccontrol/vcsserver-1/profile/bin/git
             ssh.executable.svn = ~/.rccontrol/vcsserver-1/profile/bin/svnserve
-            ## Enables SSH Key generator web interface. Disabling this still allows users
+            ## Enables SSH key generator web interface. Disabling this still allows users
             ## to add their own keys.
-            ssh.enable_generator = true
+            ssh.enable_ui_key_generator = true
                
                    
                
                
            


        

    

      

  

      
          

              

                    
                        
                        note
                    

              
          
          
              
  

  
    
  
  

  

    
        marcink
    
  

          

          
              Wed, 13 Feb 2019 21:30:46
          


          

              
                
              

          

                    
                        outdated v1
                        |
                    

            
              
              

                
                    Comment #21545
                    
                

                    
                    
                      Edit
                    
                    
                      Delete
                    
              
            

            |
                  
                 

          
      
      
          Just a proposal not a big deal to make it more explicit. Maybe ssh.enable_ui_key_generator ?
             ## Dummy marker to add new entries after.

rhodecode/tests/rhodecode.ini unresolved comments ¶ 0

	This file was removed from diff during updates to this pull-request. There are still outdated/unresolved comments attached to it.
					note marcink Wed, 13 Feb 2019 21:30:46 outdated `v1` `\|` Comment #21545 Edit Delete `\|` Just a proposal not a big deal to make it more explicit. Maybe ssh.enable_ui_key_generator ?

rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako unresolved comments ¶ 0

	This file was removed from diff during updates to this pull-request. There are still outdated/unresolved comments attached to it.
					note marcink Wed, 13 Feb 2019 21:32:13 outdated `v1` `\|` Comment #21546 Edit Delete `\|` I wonder if we should put here a link for users with example key generation ? `ssh-keygen -t rsa -b 4096 -C "your_email@example.com"` note csalgau Wed, 13 Feb 2019 22:21:39 author outdated `v1` `\|` Comment #21550 Edit Delete `\|` In theory, users shouldn't be able to see this string without pasting or manually adding /generate in their URL. I think having the endpoint fail nicely is better than 404-ing. Unless you're going for easter eggs on hidden URL, I would rather suggest adding instructions to the main key management page. note marcink Wed, 13 Feb 2019 22:24:15 outdated `v1` `\|` Comment #21551 Edit Delete `\|` Right, this is the generate page, missed that. Yes this makes sense. todo marcink Wed, 13 Feb 2019 23:24:45 outdated `v2` `\|` Comment #21564 Edit Delete `\|` Actually Jenkins is right :D elif needs a condition too. I believe this should be %else fix #21564 csalgau Thu, 14 Feb 2019 00:18:09 author Comment #21566 Edit Delete `\|` I did have that fixed on the live template. I just didn't sync it.

rhodecode/templates/admin/my_account/my_account_ssh_keys.mako unresolved comments ¶ 0

	This file was removed from diff during updates to this pull-request. There are still outdated/unresolved comments attached to it.
					note marcink Wed, 13 Feb 2019 21:33:13 `v1` `\|` Comment #21547 Edit Delete `\|` +1 for spelling fix ;) todo marcink Wed, 13 Feb 2019 22:28:02 outdated `v1` `\|` Comment #21554 Edit Delete `\|` While jenkins tests this and shows the error, i'll point out that this `endif` generates syntax error. Should be `% endif` note csalgau Wed, 13 Feb 2019 22:30:37 author outdated `v1` `\|` Comment #21555 Edit Delete `\|` indeed I goofed on that. I'm working with a convoluted docker on windows setup and diffing things manually. fix #21554 csalgau Wed, 13 Feb 2019 22:52:29 author `v2` `\|` Comment #21558 Edit Delete `\|` fixed in r3207

Expand all files

configs/development.ini

0 +4 0

             ssh.executable.git = ~/.rccontrol/vcsserver-1/profile/bin/git
             ssh.executable.svn = ~/.rccontrol/vcsserver-1/profile/bin/svnserve
+            ## Enables SSH Key generator web interface. Disabling this still allows users
+            ## to add their own keys.
+            ssh.enable_generator = true
             ## Dummy marker to add new entries after.
             ## Add any custom entries below. Please don't remove.

configs/production.ini

0 +4 0

             ssh.executable.git = ~/.rccontrol/vcsserver-1/profile/bin/git
             ssh.executable.svn = ~/.rccontrol/vcsserver-1/profile/bin/svnserve
+            ## Enables SSH Key generator web interface. Disabling this still allows users
+            ## to add their own keys.
+            ssh.enable_generator = true
             ## Dummy marker to add new entries after.
             ## Add any custom entries below. Please don't remove.

docs/auth/ssh-connection.rst

0 +4 0

                     ssh.executable.git = ~/.rccontrol/vcsserver-1/profile/bin/git
                     ssh.executable.svn = ~/.rccontrol/vcsserver-1/profile/bin/svnserve
+                    ## Enables SSH Key generator web interface. Disabling this still allows users
+                    ## to add their own keys.
+                    ssh.enable_generator = true
 . Set base_url for instance to enable proper event handling (Optional):

rhodecode/apps/my_account/views/my_account_ssh_keys.py

0 +5 -4

                     c = self.load_default_context()
                     c.active = 'ssh_keys_generate'
-                    comment = 'RhodeCode-SSH {}'.format(c.user.email or '')
+                    if c.ssh_generator_enabled:
-                    c.private, c.public = SshKeyModel().generate_keypair(comment=comment)
+                        comment = 'RhodeCode-SSH {}'.format(c.user.email or '')
-                    c.target_form_url = h.route_path(
+                        c.private, c.public = SshKeyModel().generate_keypair(comment=comment)
-                        'my_account_ssh_keys', _query=dict(default_key=c.public))
+                        c.target_form_url = h.route_path(
+                            'my_account_ssh_keys', _query=dict(default_key=c.public))
                     return self._get_template_context(c)
                 @LoginRequired()

rhodecode/apps/ssh_support/__init__.py

0 +1 0

                 _bool_setting(settings, config_keys.generate_authorized_keyfile, 'false')
                 _bool_setting(settings, config_keys.wrapper_allow_shell, 'false')
                 _bool_setting(settings, config_keys.enable_debug_logging, 'false')
+                _bool_setting(settings, config_keys.ssh_generator_enabled, 'true')
                 _string_setting(settings, config_keys.authorized_keys_file_path,
                                 '~/.ssh/authorized_keys_rhodecode',

rhodecode/apps/ssh_support/config_keys.py

0 +1 0

             generate_authorized_keyfile = 'ssh.generate_authorized_keyfile'
             authorized_keys_file_path = 'ssh.authorized_keys_file_path'
             authorized_keys_line_ssh_opts = 'ssh.authorized_keys_ssh_opts'
+            ssh_generator_enabled = 'ssh.enable_generator'
             wrapper_cmd = 'ssh.wrapper_cmd'
             wrapper_allow_shell = 'ssh.wrapper_cmd_allow_shell'
             enable_debug_logging = 'ssh.enable_debug_logging'

rhodecode/lib/base.py

0 +2 0

                     config.get('labs_settings_active', 'false'))
                 context.ssh_enabled = str2bool(
                     config.get('ssh.generate_authorized_keyfile', 'false'))
+                context.ssh_generator_enabled = str2bool(
+                    config.get('ssh.enable_generator', 'true'))
                 context.visual.allow_repo_location_change = str2bool(
                     config.get('allow_repo_location_change', True))

rhodecode/templates/admin/my_account/my_account_ssh_keys.mako

1 +4 -2

                                     </div>
                                     <div class="input">
                                         ${h.text('description', class_='medium', placeholder=_('Description'))}
-                                        <a href="${h.route_path('my_account_ssh_keys_generate')}">${_('Generate random RSA key')}</a>
+                                        % if c.ssh_generator_enabled:
+                                            <a href="${h.route_path('my_account_ssh_keys_generate')}">${_('Generate random RSA key')}</a>
+                                        $ endif
                                     </div>
                                  </div>
                                   ${h.reset('reset',_('Reset'),class_="btn")}
                                 </div>
                                 % if c.default_key:
-                                    ${_('Click add to use this generate SSH key')}
+                                    ${_('Click add to use this generated SSH key')}
                
                    
                
                
            


        

    

      

  

      
          

              

                    
                        
                        note
                    

              
          
          
              
  

  
    
  
  

  

    
        marcink
    
  

          

          
              Wed, 13 Feb 2019 21:33:13
          


          

              
                
              

          

                    
                        v1
                        |
                    

            
              
              

                
                    Comment #21547
                    
                

                    
                    
                      Edit
                    
                    
                      Delete
                    
              
            

            |
                 
                 

          
      
      
          +1 for spelling fix ;)
                                 % endif
                             </div>
                         </div>

rhodecode/templates/admin/users/user_edit_ssh_keys.mako

0 +3 -1

                                     </div>
                                     <div class="input">
                                         ${h.text('description', class_='medium', placeholder=_('Description'))}
-                                        <a href="${h.route_path('edit_user_ssh_keys_generate_keypair', user_id=c.user.user_id)}">${_('Generate random RSA key')}</a>
+                                        % if c.ssh_generator_enabled:
+                                            <a href="${h.route_path('edit_user_ssh_keys_generate_keypair', user_id=c.user.user_id)}">${_('Generate random RSA key')}</a>
+                                        % endif
                                     </div>
                                  </div>

rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako

0 +29 -23

@@ -1,13 +1,14 b''
1	<div class="panel panel-default">	1	<div class="panel panel-default">
2	<div class="panel-heading">	2	<div class="panel-heading">
3	<h3 class="panel-title">${_('New SSH Key generated')}</h3>	3	<h3 class="panel-title">${_('New SSH Key generation')}</h3>
4	</div>	4	</div>
5	<div class="panel-body">	5	<div class="panel-body">
6	<p>	6	%if c.ssh_enabled and c.ssh_generator_enabled:
7	${_('Below is a 2048 bit generated SSH RSA key. You can use it to access RhodeCode via the SSH wrapper.')}	7	<p>
8	</p>	8	${_('Below is a 2048 bit generated SSH RSA key. You can use it to access RhodeCode via the SSH wrapper.')}
9	<h4>${_('Private key')}</h4>	9	</p>
10	<pre>	10	<h4>${_('Private key')}</h4>
		11	<pre>
11	# Save the below content as	12	# Save the below content as
12	# Windows: /Users/{username}/.ssh/id_rsa_rhodecode_access_priv.key	13	# Windows: /Users/{username}/.ssh/id_rsa_rhodecode_access_priv.key
13	# macOS: /Users/{yourname}/.ssh/id_rsa_rhodecode_access_priv.key	14	# macOS: /Users/{yourname}/.ssh/id_rsa_rhodecode_access_priv.key
@@ -15,30 +16,35 b''
15		16
16	# Change permissions to 0600 to make it secure, and usable.	17	# Change permissions to 0600 to make it secure, and usable.
17	e.g chmod 0600 /home/{username}/.ssh/id_rsa_rhodecode_access_priv.key	18	e.g chmod 0600 /home/{username}/.ssh/id_rsa_rhodecode_access_priv.key
18	</pre>	19	</pre>
19		20
20	<div>	21	<div>
21	<textarea style="height: 300px">${c.private}</textarea>	22	<textarea style="height: 300px">${c.private}</textarea>
22	</div>	23	</div>
23	<br/>	24	<br/>
24		25
25	<h4>${_('Public key')}</h4>	26	<h4>${_('Public key')}</h4>
26	<pre>	27	<pre>
27	# Save the below content as	28	# Save the below content as
28	# Windows: /Users/{username}/.ssh/id_rsa_rhodecode_access_pub.key	29	# Windows: /Users/{username}/.ssh/id_rsa_rhodecode_access_pub.key
29	# macOS: /Users/{yourname}/.ssh/id_rsa_rhodecode_access_pub.key	30	# macOS: /Users/{yourname}/.ssh/id_rsa_rhodecode_access_pub.key
30	# Linux: /home/{username}/.ssh/id_rsa_rhodecode_access_pub.key	31	# Linux: /home/{username}/.ssh/id_rsa_rhodecode_access_pub.key
31	</pre>	32	</pre>
32		33
33	<input type="text" value="${c.public}" class="large text" size="100"/>	34	<input type="text" value="${c.public}" class="large text" size="100"/>
34	<p>	35	<p>
35	% if hasattr(c, 'target_form_url'):	36	% if hasattr(c, 'target_form_url'):
36	<a href="${c.target_form_url}">${_('Use this generated key')}.</a>	37	<a href="${c.target_form_url}">${_('Use this generated key')}.</a>
37	% else:	38	% else:
38	<a href="${h.route_path('edit_user_ssh_keys', user_id=c.user.user_id, _query=dict(default_key=c.public))}">${_('Use this generated key')}.</a>	39	<a href="${h.route_path('edit_user_ssh_keys', user_id=c.user.user_id, _query=dict(default_key=c.public))}">${_('Use this generated key')}.</a>
39	% endif	40	% endif
40	${_('Confirmation required on the next screen')}.	41	${_('Confirmation required on the next screen')}.
41	</p>	42	</p>
		43	% elif:
		44	<h2>
		45	${_('SSH key generator has been disabled.')}
		46	</h2>
		47	% endif
42	</div>	48	</div>
43	</div>	49	</div>
44		50

rhodecode/tests/rhodecode.ini

0 +4 0

             ssh.executable.git = ~/.rccontrol/vcsserver-1/profile/bin/git
             ssh.executable.svn = ~/.rccontrol/vcsserver-1/profile/bin/svnserve
+            ## Enables SSH Key generator web interface. Disabling this still allows users
+            ## to add their own keys.
+            ssh.enable_generator = true
             ## Dummy marker to add new entries after.
             ## Add any custom entries below. Please don't remove.

rhodecode/tests/rhodecode.ini unresolved comments ¶ 0

	This file was removed from diff during updates to this pull-request. There are still outdated/unresolved comments attached to it.
					note marcink Wed, 13 Feb 2019 21:30:46 outdated `v1` `\|` Comment #21545 Edit Delete `\|` Just a proposal not a big deal to make it more explicit. Maybe ssh.enable_ui_key_generator ?

rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako unresolved comments ¶ 0

	This file was removed from diff during updates to this pull-request. There are still outdated/unresolved comments attached to it.
					note marcink Wed, 13 Feb 2019 21:32:13 outdated `v1` `\|` Comment #21546 Edit Delete `\|` I wonder if we should put here a link for users with example key generation ? `ssh-keygen -t rsa -b 4096 -C "your_email@example.com"` note csalgau Wed, 13 Feb 2019 22:21:39 author outdated `v1` `\|` Comment #21550 Edit Delete `\|` In theory, users shouldn't be able to see this string without pasting or manually adding /generate in their URL. I think having the endpoint fail nicely is better than 404-ing. Unless you're going for easter eggs on hidden URL, I would rather suggest adding instructions to the main key management page. note marcink Wed, 13 Feb 2019 22:24:15 outdated `v1` `\|` Comment #21551 Edit Delete `\|` Right, this is the generate page, missed that. Yes this makes sense. todo marcink Wed, 13 Feb 2019 23:24:45 outdated `v2` `\|` Comment #21564 Edit Delete `\|` Actually Jenkins is right :D elif needs a condition too. I believe this should be %else fix #21564 csalgau Thu, 14 Feb 2019 00:18:09 author Comment #21566 Edit Delete `\|` I did have that fixed on the live template. I just didn't sync it.

rhodecode/templates/admin/my_account/my_account_ssh_keys.mako unresolved comments ¶ 0

	This file was removed from diff during updates to this pull-request. There are still outdated/unresolved comments attached to it.
					note marcink Wed, 13 Feb 2019 21:33:13 `v1` `\|` Comment #21547 Edit Delete `\|` +1 for spelling fix ;) todo marcink Wed, 13 Feb 2019 22:28:02 outdated `v1` `\|` Comment #21554 Edit Delete `\|` While jenkins tests this and shows the error, i'll point out that this `endif` generates syntax error. Should be `% endif` note csalgau Wed, 13 Feb 2019 22:30:37 author outdated `v1` `\|` Comment #21555 Edit Delete `\|` indeed I goofed on that. I'm working with a convoluted docker on windows setup and diffing things manually. fix #21554 csalgau Wed, 13 Feb 2019 22:52:29 author `v2` `\|` Comment #21558 Edit Delete `\|` fixed in r3207

General Comments 23

csalgau

v1 |

|

Auto status change to "Under Review"

note

jenkins-tests

v1 |

|

Build Failed: http://internal-jenkins.rhodecode.com/job/rhodecode-enterprise-ce-public-prs/9//console

note

csalgau

v1 |

|

Changed one (untranslated) string, added one new string.
I'm writing against a running test instance. Did not touch translations folder.

note

marcink

v1 |

|

Let me change the CI config so it sends the test results in a comment.

note

csalgau

v1 |

|

I meant to write

Changed two (untranslated) strings, added one new string.

jenkins-tests

v1 |

|

[PR tests] Build Failed on : build-log

cla-bot

v1 |

|

CLA FOUND and APPROVED

note

csalgau

v1 |

|

I'm not clear on how the build log from the CI jenkins bot should work. I'm guessing you're still working on that.

note

marcink

v1 |

|

There's a failing test, let me fix Jenkins to show the output.

jenkins-tests

v1 |

|

[PR tests] Build Failed on : build-log

csalgau

v2 |

|

Pull request updated. Auto status change to "Under Review"

Changed commits:
  * 1 added
  * 0 removed

Changed files:
  * M configs/development.ini
  * M configs/production.ini
  * M docs/auth/ssh-connection.rst
  * M rhodecode/apps/my_account/views/my_account_ssh_keys.py
  * M rhodecode/apps/ssh_support/__init__.py
  * M rhodecode/apps/ssh_support/config_keys.py
  * M rhodecode/lib/base.py
  * M rhodecode/templates/admin/my_account/my_account_ssh_keys.mako
  * M rhodecode/templates/admin/users/user_edit_ssh_keys.mako
  * M rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako
  * M rhodecode/tests/rhodecode.ini

cla-bot

v2 |

|

CLA FOUND and APPROVED

note

csalgau

v2 |

|

This is entirely text editor based right now. I'll be in a much better position to test things with #5534 in place :)

jenkins-tests

v2 |

|

[PR tests] Build Failed: build-log

note

csalgau

v2 |

|

@marcink pretty sure@jenkins-tests posted the wrong build log. it's the same log as last time.

note

marcink

v2 |

|

Yes, sorry about that. We did lots of Jenkins Changes receantly, and seems there are hickups!

Let me investigate.

csalgau

|

Pull request updated. Auto status change to "Under Review"

Changed commits:
  * 1 added
  * 0 removed

Changed files:
  * M rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako

cla-bot

|

CLA FOUND and APPROVED

note

csalgau

|

So I'm going to make a small complaint about the fact that the public repository is missing the 4.15 branch and my test instance is up-to-date. This makes syncing things less than straight forward. Also, for some reason it looked to me like both build bot posts pointed to the same file. Looks ok now.

note

marcink

|

Yeah, i'd realized that now that infact 4.15 is not pushed to the public instance... This should be done automatically.
I'll make sure we re-sync the codebase today.

jenkins-tests

|

Build Succeeded!

marcink

|

Thank you for this contribution. This looks ok, i'll merge this manually on top of our current default develop branch.

marcink

|

Closing with status change > Approved.

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages