Indefero

Indefero Commit Details


Date:2009-01-14 16:05:52 (16 years 9 months ago)
Author:Loic d'Anterroches
Branch:dev, develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3
Commit:419601bb92ac5683ded7b07ac67312854e9cfb74
Parents: 7f32c6f3775d575d68210b37edfa98eb351faf1d
Message:Added the upload of the SSH key for the end user.
Changes:

File differences

src/IDF/Form/UserAccount.php
8282
8383
8484
85
86
87
88
89
90
91
92
93
94
8595
8696
8797
......
107117
108118
109119
120
121
122
123
124
125
126
127
128
110129
111130
131
132
133
134
135
112136
113137
114138
'size' => 15,␊
),␊
));␊
␊
$this->fields['ssh_key'] = new Pluf_Form_Field_Varchar(␊
array('required' => false,␊
'label' => __('Your public SSH key'),␊
'initial' => '',␊
'widget_attrs' => array('rows' => 3,␊
'cols' => 40),␊
'widget' => 'Pluf_Form_Widget_TextareaInput',␊
'help_text' => __('Be careful to provide your public key and not your private key!')␊
));␊
␊
␊
}␊
$update_pass = true;␊
}␊
$this->user->setFromFormData($this->cleaned_data);␊
// Get keys␊
$keys = $this->user->get_idf_key_list();␊
if ($keys->count() > 0) {␊
$key = $keys[0];␊
} else {␊
$key = new IDF_Key();␊
$key->user = $this->user;␊
}␊
$key->content = $this->cleaned_data['ssh_key'];␊
if ($commit) {␊
$this->user->update();␊
if ($key->id != '') {␊
$key->update();␊
} else {␊
$key->create();␊
}␊
if ($update_pass) {␊
/**␊
* [signal]␊
src/IDF/Key.php
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
<?php␊
/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */␊
/*␊
# ***** BEGIN LICENSE BLOCK *****␊
# This file is part of InDefero, an open source project management application.␊
# Copyright (C) 2008 Céondo Ltd and contributors.␊
#␊
# InDefero is free software; you can redistribute it and/or modify␊
# it under the terms of the GNU General Public License as published by␊
# the Free Software Foundation; either version 2 of the License, or␊
# (at your option) any later version.␊
#␊
# InDefero is distributed in the hope that it will be useful,␊
# but WITHOUT ANY WARRANTY; without even the implied warranty of␊
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the␊
# GNU General Public License for more details.␊
#␊
# You should have received a copy of the GNU General Public License␊
# along with this program; if not, write to the Free Software␊
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA␊
#␊
# ***** END LICENSE BLOCK ***** */␊
␊
/**␊
* Storage of the SSH keys.␊
*␊
*/␊
class IDF_Key extends Pluf_Model␊
{␊
public $_model = __CLASS__;␊
␊
function init()␊
{␊
$this->_a['table'] = 'idf_keys';␊
$this->_a['model'] = __CLASS__;␊
$this->_a['cols'] = array(␊
// It is mandatory to have an "id" column.␊
'id' =>␊
array(␊
'type' => 'Pluf_DB_Field_Sequence',␊
//It is automatically added.␊
'blank' => true, ␊
),␊
'user' => ␊
array(␊
'type' => 'Pluf_DB_Field_Foreignkey',␊
'model' => 'Pluf_User',␊
'blank' => false,␊
'verbose' => __('user'),␊
),␊
'content' =>␊
array(␊
'type' => 'Pluf_DB_Field_Text',␊
'blank' => false,␊
'verbose' => __('ssh key'),␊
),␊
);␊
// WARNING: Not using getSqlTable on the Pluf_User object to␊
// avoid recursion.␊
$t_users = $this->_con->pfx.'users'; ␊
$this->_a['views'] = array(␊
'join_user' => ␊
array(␊
'join' => 'LEFT JOIN '.$t_users␊
.' ON '.$t_users.'.id='.$this->_con->qn('user'),␊
'select' => $this->getSelect().', '␊
.$t_users.'.login AS login',␊
'props' => array('login' => 'login'),␊
)␊
);␊
}␊
␊
function postSave($create=false)␊
{␊
/**␊
* [signal]␊
*␊
* IDF_Key::postSave␊
*␊
* [sender]␊
*␊
* IDF_Key␊
*␊
* [description]␊
*␊
* This signal allows an application to perform special␊
* operations after the saving of a SSH Key.␊
*␊
* [parameters]␊
*␊
* array('key' => $key,␊
* 'created' => true/false)␊
*␊
*/␊
$params = array('key' => $this, 'created' => $create);␊
Pluf_Signal::send('IDF_Key::postSave',␊
'IDF_Key', $params);␊
}␊
␊
}␊
src/IDF/Migrations/10SshKey.php
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
<?php␊
/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */␊
/*␊
# ***** BEGIN LICENSE BLOCK *****␊
# This file is part of InDefero, an open source project management application.␊
# Copyright (C) 2008 Céondo Ltd and contributors.␊
#␊
# InDefero is free software; you can redistribute it and/or modify␊
# it under the terms of the GNU General Public License as published by␊
# the Free Software Foundation; either version 2 of the License, or␊
# (at your option) any later version.␊
#␊
# InDefero is distributed in the hope that it will be useful,␊
# but WITHOUT ANY WARRANTY; without even the implied warranty of␊
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the␊
# GNU General Public License for more details.␊
#␊
# You should have received a copy of the GNU General Public License␊
# along with this program; if not, write to the Free Software␊
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA␊
#␊
# ***** END LICENSE BLOCK ***** */␊
␊
/**␊
* Add the SSH key.␊
*/␊
␊
function IDF_Migrations_10SshKey_up($params=null)␊
{␊
$models = array(␊
'IDF_Key',␊
);␊
$db = Pluf::db();␊
$schema = new Pluf_DB_Schema($db);␊
foreach ($models as $model) {␊
$schema->model = new $model();␊
$schema->createTables();␊
}␊
}␊
␊
function IDF_Migrations_10SshKey_down($params=null)␊
{␊
$models = array(␊
'IDF_Key',␊
);␊
$db = Pluf::db();␊
$schema = new Pluf_DB_Schema($db);␊
foreach ($models as $model) {␊
$schema->model = new $model();␊
$schema->dropTables();␊
}␊
}
src/IDF/Migrations/Install.php
4545
4646
4747
48
4849
4950
5051
......
8283
8384
8485
86
8587
8688
8789
'IDF_Review',␊
'IDF_Review_Patch',␊
'IDF_Review_FileComment',␊
'IDF_Key',␊
);␊
$db = Pluf::db();␊
$schema = new Pluf_DB_Schema($db);␊
$perm = Pluf_Permission::getFromString('IDF.project-authorized-user');␊
if ($perm) $perm->delete();␊
$models = array(␊
'IDF_Key',␊
'IDF_Review_FileComment',␊
'IDF_Review_Patch',␊
'IDF_Review',␊
src/IDF/Plugin/SyncGit/Cron.php
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
<?php␊
/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */␊
/*␊
# ***** BEGIN LICENSE BLOCK *****␊
# This file is part of InDefero, an open source project management application.␊
# Copyright (C) 2008 Céondo Ltd and contributors.␊
#␊
# InDefero is free software; you can redistribute it and/or modify␊
# it under the terms of the GNU General Public License as published by␊
# the Free Software Foundation; either version 2 of the License, or␊
# (at your option) any later version.␊
#␊
# InDefero is distributed in the hope that it will be useful,␊
# but WITHOUT ANY WARRANTY; without even the implied warranty of␊
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the␊
# GNU General Public License for more details.␊
#␊
# You should have received a copy of the GNU General Public License␊
# along with this program; if not, write to the Free Software␊
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA␊
#␊
# ***** END LICENSE BLOCK ***** */␊
␊
/**␊
* Synchronize the SSH keys with InDefero.␊
*/␊
class IDF_Plugin_SyncGit_Cron␊
{␊
/**␊
* Template for the SSH key.␊
*/␊
public $template = 'command="%s %s",no-port-forwarding,no-X11-forwarding,'␊
.'no-agent-forwarding,no-pty %s';␊
␊
/**␊
* Synchronize.␊
*/␊
public static function sync()␊
{␊
$template = Pluf::factory(__CLASS__)->template;␊
$keys = Pluf::factory('IDF_Key')->getList(array('view'=>'join_user'));␊
$cmd = Pluf::f('idf_plugin_syncgit_path_gitserve', '/bin/false');␊
$authorized_keys = Pluf::f('idf_plugin_syncgit_path_authorized_keys', false);␊
if (false == $authorized_keys) {␊
throw new Pluf_Exception_SettingError('Setting git_path_authorized_keys not set.');␊
}␊
if (!is_writable($authorized_keys)) {␊
throw new Exception('Cannot create file: '.$authorized_keys);␊
}␊
$out = '';␊
foreach ($keys as $key) {␊
if (strlen($key->content) > 40 // minimal check␊
and preg_match('/^[a-zA-Z][a-zA-Z0-9_.-]*(@[a-zA-Z][a-zA-Z0-9.-]*)?$/', $key->login)) {␊
$content = str_replace("\n", '', $key->content);␊
$out .= sprintf($template, $cmd, $key->login, $content)."\n";␊
}␊
}␊
file_put_contents($authorized_keys, $out, LOCK_EX); ␊
}␊
}␊
src/IDF/Plugin/SyncGit/Serve.php
3636
3737
3838
39
40
41
42
43
4439
4540
4641
......
120115
121116
122117
123
118
124119
125120
126121
......
171166
172167
173168
174
169
175170
176171
177172
178
173
179174
180175
181176
public $commands_write = array('git-receive-pack', 'git receive-pack');␊
␊
/**␊
* Check that the command is authorized.␊
*/␊
␊
␊
/**␊
* Serve a git request.␊
*␊
* @param string Username.␊
exit(1);␊
}␊
$cmd = $env['SSH_ORIGINAL_COMMAND'];␊
chdir(Pluf::f('git_home_dir', '/home/git'));␊
chdir(Pluf::f('idf_plugin_syncgit_git_home_dir', '/home/git'));␊
$serve = new IDF_Plugin_SyncGit_Serve();␊
try {␊
$new_cmd = $serve->serve($username, $cmd);␊
$request->user = $user;␊
if (true === IDF_Precondition::accessTabGeneric($request, 'source_access_rights')) {␊
if ($mode == 'readonly') {␊
return array(Pluf::f('git_base_repositories', '/home/git/repositories'),␊
return array(Pluf::f('idf_plugin_syncgit_base_repositories', '/home/git/repositories'),␊
$project->shortname);␊
}␊
if (true === IDF_Precondition::projectMemberOrOwner($request)) {␊
return array(Pluf::f('git_base_repositories', '/home/git/repositories'),␊
return array(Pluf::f('idf_plugin_syncgit_base_repositories', '/home/git/repositories'),␊
$project->shortname);␊
}␊
}␊
src/IDF/Views/User.php
124124
125125
126126
127
128
129
130
131
132
127133
128134
129135
130136
137
131138
132139
133140
unset($data['password']);␊
$form = new IDF_Form_UserAccount($data, $params);␊
}␊
$keys = $request->user->get_idf_key_list();␊
if ($keys->count() > 0 and strlen($keys[0]->content) > 30) {␊
$ssh_key = Pluf_Template::markSafe('<span class="mono">'.Pluf_esc(substr($keys[0]->content, 0, 30)).'...</span><br /><span class="helptext">'.__('Troncated for security reasons.').'</span>');␊
} else {␊
$ssh_key = __('You have not upload your public SSH key yet.');␊
}␊
return Pluf_Shortcuts_RenderToResponse('idf/user/myaccount.html', ␊
array('page_title' => __('Your Account'),␊
'api_key' => $api_key,␊
'ext_pass' => $ext_pass,␊
'ssh_key' => $ssh_key,␊
'form' => $form),␊
$request);␊
}␊
src/IDF/relations.php
3737
3838
3939
40
40
4141
4242
4343
'relate_to_many' => array('IDF_Tag', 'Pluf_User'));␊
$m['IDF_Review_Patch'] = array('relate_to' => array('IDF_Review', 'Pluf_User'));␊
$m['IDF_Review_FileComment'] = array('relate_to' => array('IDF_Review_Patch', 'Pluf_User'));␊
␊
$m['IDF_Key'] = array('relate_to' => array('Pluf_User'));␊
␊
Pluf_Signal::connect('Pluf_Template_Compiler::construct_template_tags_modifiers',␊
array('IDF_Middleware', 'updateTemplateTagsModifiers'));␊
src/IDF/templates/idf/user/myaccount.html
4646
4747
4848
49
50
51
52
53
54
55
56
4957
5058
5159
{$form.f.password2|unsafe}␊
</td>␊
</tr>␊
<tr>␊
<th>{$form.f.ssh_key.labelTag}:</th>␊
<td>{if $form.f.ssh_key.errors}{$form.f.ssh_key.fieldErrors}{/if}␊
{$ssh_key}<br />␊
{$form.f.ssh_key|unsafe}<br />␊
<span class="helptext">{$form.f.ssh_key.help_text}</span>␊
</td>␊
</tr>␊
<tr class="pass-info" id="extra-password">␊
<th>{trans 'Extra password'}:</th>␊
<td><span class="mono">{$ext_pass}</span><br />␊

Archive Download the corresponding diff file

Page rendered in 0.54891s using 13 queries.