Blame

Date:
Message:
Trivial changes: whitespace and modes. Remote whitespace at the ends of lines. Remove blank lines from the ends of files. Change modes on source files so that they are not executable. Signed-off-by: Dan Cross <cross@gajendra.net>
Actions:
History | Blob | Raw File
  1 be8b315d 2004-06-17 devnull #include <u.h>

  2 be8b315d 2004-06-17 devnull #include <libc.h>

  3 be8b315d 2004-06-17 devnull #include <fcall.h>

  4 be8b315d 2004-06-17 devnull #include <auth.h>

  5 648bb6f7 2005-02-08 devnull #include <9pclient.h>

  6 be8b315d 2004-06-17 devnull #include "authlocal.h"

  7 be8b315d 2004-06-17 devnull 

  8 fa325e9b 2020-01-10 cross enum {

  9 cbeb0b26 2006-04-01 devnull 	ARgiveup = 100

 10 be8b315d 2004-06-17 devnull };

 11 be8b315d 2004-06-17 devnull 

 12 be8b315d 2004-06-17 devnull static uchar*

 13 be8b315d 2004-06-17 devnull gstring(uchar *p, uchar *ep, char **s)

 14 be8b315d 2004-06-17 devnull {

 15 be8b315d 2004-06-17 devnull 	uint n;

 16 be8b315d 2004-06-17 devnull 

 17 be8b315d 2004-06-17 devnull 	if(p == nil)

 18 be8b315d 2004-06-17 devnull 		return nil;

 19 be8b315d 2004-06-17 devnull 	if(p+BIT16SZ > ep)

 20 be8b315d 2004-06-17 devnull 		return nil;

 21 be8b315d 2004-06-17 devnull 	n = GBIT16(p);

 22 be8b315d 2004-06-17 devnull 	p += BIT16SZ;

 23 be8b315d 2004-06-17 devnull 	if(p+n > ep)

 24 be8b315d 2004-06-17 devnull 		return nil;

 25 be8b315d 2004-06-17 devnull 	*s = malloc(n+1);

 26 be8b315d 2004-06-17 devnull 	memmove((*s), p, n);

 27 be8b315d 2004-06-17 devnull 	(*s)[n] = '\0';

 28 be8b315d 2004-06-17 devnull 	p += n;

 29 be8b315d 2004-06-17 devnull 	return p;

 30 be8b315d 2004-06-17 devnull }

 31 be8b315d 2004-06-17 devnull 

 32 be8b315d 2004-06-17 devnull static uchar*

 33 be8b315d 2004-06-17 devnull gcarray(uchar *p, uchar *ep, uchar **s, int *np)

 34 be8b315d 2004-06-17 devnull {

 35 be8b315d 2004-06-17 devnull 	uint n;

 36 be8b315d 2004-06-17 devnull 

 37 be8b315d 2004-06-17 devnull 	if(p == nil)

 38 be8b315d 2004-06-17 devnull 		return nil;

 39 be8b315d 2004-06-17 devnull 	if(p+BIT16SZ > ep)

 40 be8b315d 2004-06-17 devnull 		return nil;

 41 be8b315d 2004-06-17 devnull 	n = GBIT16(p);

 42 be8b315d 2004-06-17 devnull 	p += BIT16SZ;

 43 be8b315d 2004-06-17 devnull 	if(p+n > ep)

 44 be8b315d 2004-06-17 devnull 		return nil;

 45 be8b315d 2004-06-17 devnull 	*s = malloc(n);

 46 be8b315d 2004-06-17 devnull 	if(*s == nil)

 47 be8b315d 2004-06-17 devnull 		return nil;

 48 be8b315d 2004-06-17 devnull 	memmove((*s), p, n);

 49 be8b315d 2004-06-17 devnull 	*np = n;

 50 be8b315d 2004-06-17 devnull 	p += n;

 51 be8b315d 2004-06-17 devnull 	return p;

 52 be8b315d 2004-06-17 devnull }

 53 be8b315d 2004-06-17 devnull 

 54 be8b315d 2004-06-17 devnull void

 55 be8b315d 2004-06-17 devnull auth_freeAI(AuthInfo *ai)

 56 be8b315d 2004-06-17 devnull {

 57 be8b315d 2004-06-17 devnull 	if(ai == nil)

 58 be8b315d 2004-06-17 devnull 		return;

 59 be8b315d 2004-06-17 devnull 	free(ai->cuid);

 60 be8b315d 2004-06-17 devnull 	free(ai->suid);

 61 be8b315d 2004-06-17 devnull 	free(ai->cap);

 62 be8b315d 2004-06-17 devnull 	free(ai->secret);

 63 be8b315d 2004-06-17 devnull 	free(ai);

 64 be8b315d 2004-06-17 devnull }

 65 be8b315d 2004-06-17 devnull 

 66 be8b315d 2004-06-17 devnull static uchar*

 67 be8b315d 2004-06-17 devnull convM2AI(uchar *p, int n, AuthInfo **aip)

 68 be8b315d 2004-06-17 devnull {

 69 be8b315d 2004-06-17 devnull 	uchar *e = p+n;

 70 be8b315d 2004-06-17 devnull 	AuthInfo *ai;

 71 be8b315d 2004-06-17 devnull 

 72 be8b315d 2004-06-17 devnull 	ai = mallocz(sizeof(*ai), 1);

 73 be8b315d 2004-06-17 devnull 	if(ai == nil)

 74 be8b315d 2004-06-17 devnull 		return nil;

 75 be8b315d 2004-06-17 devnull 

 76 be8b315d 2004-06-17 devnull 	p = gstring(p, e, &ai->cuid);

 77 be8b315d 2004-06-17 devnull 	p = gstring(p, e, &ai->suid);

 78 be8b315d 2004-06-17 devnull 	p = gstring(p, e, &ai->cap);

 79 be8b315d 2004-06-17 devnull 	p = gcarray(p, e, &ai->secret, &ai->nsecret);

 80 be8b315d 2004-06-17 devnull 	if(p == nil)

 81 be8b315d 2004-06-17 devnull 		auth_freeAI(ai);

 82 be8b315d 2004-06-17 devnull 	else

 83 be8b315d 2004-06-17 devnull 		*aip = ai;

 84 be8b315d 2004-06-17 devnull 	return p;

 85 be8b315d 2004-06-17 devnull }

 86 be8b315d 2004-06-17 devnull 

 87 be8b315d 2004-06-17 devnull AuthInfo*

 88 be8b315d 2004-06-17 devnull auth_getinfo(AuthRpc *rpc)

 89 be8b315d 2004-06-17 devnull {

 90 be8b315d 2004-06-17 devnull 	AuthInfo *a;

 91 be8b315d 2004-06-17 devnull 

 92 be8b315d 2004-06-17 devnull 	if(auth_rpc(rpc, "authinfo", nil, 0) != ARok)

 93 be8b315d 2004-06-17 devnull 		return nil;

 94 a8ec4910 2005-07-13 devnull 	a = nil;

 95 be8b315d 2004-06-17 devnull 	if(convM2AI((uchar*)rpc->arg, rpc->narg, &a) == nil){

 96 be8b315d 2004-06-17 devnull 		werrstr("bad auth info from factotum");

 97 be8b315d 2004-06-17 devnull 		return nil;

 98 be8b315d 2004-06-17 devnull 	}

 99 be8b315d 2004-06-17 devnull 	return a;

100 be8b315d 2004-06-17 devnull }

101 be8b315d 2004-06-17 devnull 

102 be8b315d 2004-06-17 devnull static int

103 be8b315d 2004-06-17 devnull dorpc(AuthRpc *rpc, char *verb, char *val, int len, AuthGetkey *getkey)

104 be8b315d 2004-06-17 devnull {

105 be8b315d 2004-06-17 devnull 	int ret;

106 be8b315d 2004-06-17 devnull 

107 be8b315d 2004-06-17 devnull 	for(;;){

108 be8b315d 2004-06-17 devnull 		if((ret = auth_rpc(rpc, verb, val, len)) != ARneedkey && ret != ARbadkey)

109 be8b315d 2004-06-17 devnull 			return ret;

110 be8b315d 2004-06-17 devnull 		if(getkey == nil)

111 be8b315d 2004-06-17 devnull 			return ARgiveup;	/* don't know how */

112 be8b315d 2004-06-17 devnull 		if((*getkey)(rpc->arg) < 0)

113 be8b315d 2004-06-17 devnull 			return ARgiveup;	/* user punted */

114 be8b315d 2004-06-17 devnull 	}

115 be8b315d 2004-06-17 devnull }

116 be8b315d 2004-06-17 devnull 

117 be8b315d 2004-06-17 devnull /*

118 be8b315d 2004-06-17 devnull  *  this just proxies what the factotum tells it to.

119 be8b315d 2004-06-17 devnull  */

120 be8b315d 2004-06-17 devnull AuthInfo*

121 be8b315d 2004-06-17 devnull fauth_proxy(int fd, AuthRpc *rpc, AuthGetkey *getkey, char *params)

122 be8b315d 2004-06-17 devnull {

123 be8b315d 2004-06-17 devnull 	char *buf;

124 be8b315d 2004-06-17 devnull 	int m, n, ret;

125 be8b315d 2004-06-17 devnull 	AuthInfo *a;

126 be8b315d 2004-06-17 devnull 	char oerr[ERRMAX];

127 be8b315d 2004-06-17 devnull 

128 be8b315d 2004-06-17 devnull 	rerrstr(oerr, sizeof oerr);

129 be8b315d 2004-06-17 devnull 	werrstr("UNKNOWN AUTH ERROR");

130 be8b315d 2004-06-17 devnull 

131 be8b315d 2004-06-17 devnull 	if(dorpc(rpc, "start", params, strlen(params), getkey) != ARok){

132 be8b315d 2004-06-17 devnull 		werrstr("fauth_proxy start: %r");

133 be8b315d 2004-06-17 devnull 		return nil;

134 be8b315d 2004-06-17 devnull 	}

135 be8b315d 2004-06-17 devnull 

136 be8b315d 2004-06-17 devnull 	buf = malloc(AuthRpcMax);

137 be8b315d 2004-06-17 devnull 	if(buf == nil)

138 be8b315d 2004-06-17 devnull 		return nil;

139 be8b315d 2004-06-17 devnull 	for(;;){

140 be8b315d 2004-06-17 devnull 		switch(dorpc(rpc, "read", nil, 0, getkey)){

141 be8b315d 2004-06-17 devnull 		case ARdone:

142 be8b315d 2004-06-17 devnull 			free(buf);

143 be8b315d 2004-06-17 devnull 			a = auth_getinfo(rpc);

144 be8b315d 2004-06-17 devnull 			errstr(oerr, sizeof oerr);	/* no error, restore whatever was there */

145 be8b315d 2004-06-17 devnull 			return a;

146 be8b315d 2004-06-17 devnull 		case ARok:

147 be8b315d 2004-06-17 devnull 			if(write(fd, rpc->arg, rpc->narg) != rpc->narg){

148 be8b315d 2004-06-17 devnull 				werrstr("auth_proxy write fd: %r");

149 be8b315d 2004-06-17 devnull 				goto Error;

150 be8b315d 2004-06-17 devnull 			}

151 be8b315d 2004-06-17 devnull 			break;

152 be8b315d 2004-06-17 devnull 		case ARphase:

153 be8b315d 2004-06-17 devnull 			n = 0;

154 be8b315d 2004-06-17 devnull 			memset(buf, 0, AuthRpcMax);

155 be8b315d 2004-06-17 devnull 			while((ret = dorpc(rpc, "write", buf, n, getkey)) == ARtoosmall){

156 be8b315d 2004-06-17 devnull 				if(atoi(rpc->arg) > AuthRpcMax)

157 be8b315d 2004-06-17 devnull 					break;

158 be8b315d 2004-06-17 devnull 				m = read(fd, buf+n, atoi(rpc->arg)-n);

159 be8b315d 2004-06-17 devnull 				if(m <= 0){

160 be8b315d 2004-06-17 devnull 					if(m == 0)

161 be8b315d 2004-06-17 devnull 						werrstr("auth_proxy short read: %s", buf);

162 be8b315d 2004-06-17 devnull 					goto Error;

163 be8b315d 2004-06-17 devnull 				}

164 be8b315d 2004-06-17 devnull 				n += m;

165 be8b315d 2004-06-17 devnull 			}

166 be8b315d 2004-06-17 devnull 			if(ret != ARok){

167 be8b315d 2004-06-17 devnull 				werrstr("auth_proxy rpc write: %s: %r", buf);

168 be8b315d 2004-06-17 devnull 				goto Error;

169 be8b315d 2004-06-17 devnull 			}

170 be8b315d 2004-06-17 devnull 			break;

171 be8b315d 2004-06-17 devnull 		default:

172 be8b315d 2004-06-17 devnull 			werrstr("auth_proxy rpc: %r");

173 be8b315d 2004-06-17 devnull 			goto Error;

174 be8b315d 2004-06-17 devnull 		}

175 be8b315d 2004-06-17 devnull 	}

176 be8b315d 2004-06-17 devnull Error:

177 be8b315d 2004-06-17 devnull 	free(buf);

178 be8b315d 2004-06-17 devnull 	return nil;

179 be8b315d 2004-06-17 devnull }

180 be8b315d 2004-06-17 devnull 

181 be8b315d 2004-06-17 devnull AuthInfo*

182 be8b315d 2004-06-17 devnull auth_proxy(int fd, AuthGetkey *getkey, char *fmt, ...)

183 be8b315d 2004-06-17 devnull {

184 be8b315d 2004-06-17 devnull 	char *p;

185 be8b315d 2004-06-17 devnull 	va_list arg;

186 be8b315d 2004-06-17 devnull 	AuthInfo *ai;

187 be8b315d 2004-06-17 devnull 	AuthRpc *rpc;

188 be8b315d 2004-06-17 devnull 

189 be8b315d 2004-06-17 devnull 	quotefmtinstall();	/* just in case */

190 be8b315d 2004-06-17 devnull 	va_start(arg, fmt);

191 be8b315d 2004-06-17 devnull 	p = vsmprint(fmt, arg);

192 be8b315d 2004-06-17 devnull 	va_end(arg);

193 be8b315d 2004-06-17 devnull 

194 648bb6f7 2005-02-08 devnull 	rpc = auth_allocrpc();

195 648bb6f7 2005-02-08 devnull 	if(rpc == nil){

196 be8b315d 2004-06-17 devnull 		free(p);

197 be8b315d 2004-06-17 devnull 		return nil;

198 be8b315d 2004-06-17 devnull 	}

199 be8b315d 2004-06-17 devnull 

200 648bb6f7 2005-02-08 devnull 	ai = fauth_proxy(fd, rpc, getkey, p);

201 648bb6f7 2005-02-08 devnull 	free(p);

202 648bb6f7 2005-02-08 devnull 	auth_freerpc(rpc);

203 648bb6f7 2005-02-08 devnull 	return ai;

204 648bb6f7 2005-02-08 devnull }

205 648bb6f7 2005-02-08 devnull 

206 648bb6f7 2005-02-08 devnull /*

207 648bb6f7 2005-02-08 devnull  *  this just proxies what the factotum tells it to.

208 648bb6f7 2005-02-08 devnull  */

209 648bb6f7 2005-02-08 devnull AuthInfo*

210 648bb6f7 2005-02-08 devnull fsfauth_proxy(CFid *fid, AuthRpc *rpc, AuthGetkey *getkey, char *params)

211 648bb6f7 2005-02-08 devnull {

212 648bb6f7 2005-02-08 devnull 	char *buf;

213 648bb6f7 2005-02-08 devnull 	int m, n, ret;

214 648bb6f7 2005-02-08 devnull 	AuthInfo *a;

215 648bb6f7 2005-02-08 devnull 	char oerr[ERRMAX];

216 648bb6f7 2005-02-08 devnull 

217 648bb6f7 2005-02-08 devnull 	rerrstr(oerr, sizeof oerr);

218 648bb6f7 2005-02-08 devnull 	werrstr("UNKNOWN AUTH ERROR");

219 648bb6f7 2005-02-08 devnull 

220 648bb6f7 2005-02-08 devnull 	if(dorpc(rpc, "start", params, strlen(params), getkey) != ARok){

221 648bb6f7 2005-02-08 devnull 		werrstr("fauth_proxy start: %r");

222 648bb6f7 2005-02-08 devnull 		return nil;

223 648bb6f7 2005-02-08 devnull 	}

224 648bb6f7 2005-02-08 devnull 

225 648bb6f7 2005-02-08 devnull 	buf = malloc(AuthRpcMax);

226 648bb6f7 2005-02-08 devnull 	if(buf == nil)

227 648bb6f7 2005-02-08 devnull 		return nil;

228 648bb6f7 2005-02-08 devnull 	for(;;){

229 648bb6f7 2005-02-08 devnull 		switch(dorpc(rpc, "read", nil, 0, getkey)){

230 648bb6f7 2005-02-08 devnull 		case ARdone:

231 648bb6f7 2005-02-08 devnull 			free(buf);

232 648bb6f7 2005-02-08 devnull 			a = auth_getinfo(rpc);

233 648bb6f7 2005-02-08 devnull 			errstr(oerr, sizeof oerr);	/* no error, restore whatever was there */

234 648bb6f7 2005-02-08 devnull 			return a;

235 648bb6f7 2005-02-08 devnull 		case ARok:

236 648bb6f7 2005-02-08 devnull 			if(fswrite(fid, rpc->arg, rpc->narg) != rpc->narg){

237 648bb6f7 2005-02-08 devnull 				werrstr("auth_proxy write fid: %r");

238 648bb6f7 2005-02-08 devnull 				goto Error;

239 648bb6f7 2005-02-08 devnull 			}

240 648bb6f7 2005-02-08 devnull 			break;

241 648bb6f7 2005-02-08 devnull 		case ARphase:

242 648bb6f7 2005-02-08 devnull 			n = 0;

243 648bb6f7 2005-02-08 devnull 			memset(buf, 0, AuthRpcMax);

244 648bb6f7 2005-02-08 devnull 			while((ret = dorpc(rpc, "write", buf, n, getkey)) == ARtoosmall){

245 648bb6f7 2005-02-08 devnull 				if(atoi(rpc->arg) > AuthRpcMax)

246 648bb6f7 2005-02-08 devnull 					break;

247 648bb6f7 2005-02-08 devnull 				m = fsread(fid, buf+n, atoi(rpc->arg)-n);

248 648bb6f7 2005-02-08 devnull 				if(m <= 0){

249 648bb6f7 2005-02-08 devnull 					if(m == 0)

250 648bb6f7 2005-02-08 devnull 						werrstr("auth_proxy short read: %s", buf);

251 648bb6f7 2005-02-08 devnull 					goto Error;

252 648bb6f7 2005-02-08 devnull 				}

253 648bb6f7 2005-02-08 devnull 				n += m;

254 648bb6f7 2005-02-08 devnull 			}

255 648bb6f7 2005-02-08 devnull 			if(ret != ARok){

256 648bb6f7 2005-02-08 devnull 				werrstr("auth_proxy rpc write: %s: %r", buf);

257 648bb6f7 2005-02-08 devnull 				goto Error;

258 648bb6f7 2005-02-08 devnull 			}

259 648bb6f7 2005-02-08 devnull 			break;

260 648bb6f7 2005-02-08 devnull 		default:

261 648bb6f7 2005-02-08 devnull 			werrstr("auth_proxy rpc: %r");

262 648bb6f7 2005-02-08 devnull 			goto Error;

263 648bb6f7 2005-02-08 devnull 		}

264 648bb6f7 2005-02-08 devnull 	}

265 648bb6f7 2005-02-08 devnull Error:

266 648bb6f7 2005-02-08 devnull 	free(buf);

267 648bb6f7 2005-02-08 devnull 	return nil;

268 648bb6f7 2005-02-08 devnull }

269 648bb6f7 2005-02-08 devnull 

270 648bb6f7 2005-02-08 devnull AuthInfo*

271 648bb6f7 2005-02-08 devnull fsauth_proxy(CFid *fid, AuthGetkey *getkey, char *fmt, ...)

272 648bb6f7 2005-02-08 devnull {

273 648bb6f7 2005-02-08 devnull 	char *p;

274 648bb6f7 2005-02-08 devnull 	va_list arg;

275 648bb6f7 2005-02-08 devnull 	AuthInfo *ai;

276 648bb6f7 2005-02-08 devnull 	AuthRpc *rpc;

277 648bb6f7 2005-02-08 devnull 

278 648bb6f7 2005-02-08 devnull 	quotefmtinstall();	/* just in case */

279 648bb6f7 2005-02-08 devnull 	va_start(arg, fmt);

280 648bb6f7 2005-02-08 devnull 	p = vsmprint(fmt, arg);

281 648bb6f7 2005-02-08 devnull 	va_end(arg);

282 648bb6f7 2005-02-08 devnull 

283 648bb6f7 2005-02-08 devnull 	rpc = auth_allocrpc();

284 be8b315d 2004-06-17 devnull 	if(rpc == nil){

285 be8b315d 2004-06-17 devnull 		free(p);

286 be8b315d 2004-06-17 devnull 		return nil;

287 be8b315d 2004-06-17 devnull 	}

288 be8b315d 2004-06-17 devnull 

289 648bb6f7 2005-02-08 devnull 	ai = fsfauth_proxy(fid, rpc, getkey, p);

290 be8b315d 2004-06-17 devnull 	free(p);

291 be8b315d 2004-06-17 devnull 	auth_freerpc(rpc);

292 be8b315d 2004-06-17 devnull 	return ai;

293 be8b315d 2004-06-17 devnull }