@@ -33,6 +33,7 @@ -define(AUDITFILE,"audit.log"). -define(DOCROOT,"www"). -define(REACTORS,"reactors"). +-define(TEMP,"temp"). -define(PUBLIC,"/_public/"). -define(LOGIN,"/_login"). -define(LOGOUT,"/_logout"). Reactor/include/system.hrl @@ -99,6 +99,8 @@ handle_call({path,Res}, _From, Conf) -> Home ++ ?REACTORS ++ "/"; audit -> Home ++ ?AUDITFILE; + temp -> + Home ++ ?TEMP ++ "/"; _ -> Home end, Reactor/src/core/config_server.erl @@ -149,10 +149,67 @@ react_to('POST',?LOGIN,Request,DocRoot) -> rest_helper:show_login_form(Request,Error) end; - %% Reactor Resource dispatcher react_to(Method,?RESOURCES,Request, DocRoot) -> Request:respond({501, [], []}); + +react_to('POST',?RESOURCES ++ Path,Request, DocRoot) -> + Credentials = rest_helper:credentials(Request), + case lists:last(Path) of + $/ -> + R = case string:tokens(Path, "/") of + [_] -> + Path; + R1 -> + string:join(R1,"/") + end, + case actor_server:lookup(rest_helper:qres(R,Request)) of + [] -> + rest_helper:error(html_adaptor,create,Path,Request,"Cannot create Upload resource as child of unknown resource/domain " ++ R); + Qitem -> + case identity_server:authorise(Credentials,rest_server,create,{Qitem,[]}) of + {ok,_Actor} -> + case upload:store(Path,Request) of + {ok,File,Title,Link,Type} -> + io:format("Uploaded ~s~n",[File]), + + [Domain,Res] = string:tokens(Qitem,?DOMAINSEPERATOR), + R2 = case Res of + "/" -> + Res; + _ -> + Res ++ "/" + end, + Item = R2 ++ "upload_" ++ attribute:today(), + Attributes = [{"title",Title},{"description",rest_helper:link(Title,"/" ++ Link) ++ " uploaded resource "},{"type",rest_helper:safeUri(Type)}], + case actor_server:create(Credentials,?MODULE,Domain,Item,Attributes) of + {ok,_Xref} -> + Request:respond({200,[{"Content-Type","text/html"}],rest_helper:html("<h1>File uploaded</h1>")}); + {autherror,Why} -> + error({"Authentication Error adding upload",Why,Title}), + rest_helper:forbidden(html_adaptor,'POST',?RESOURCES ++ Path,Request,"<h1>Sorry but you do not have access privelages to upload here</h1>"); + {error,Error} -> + error({"Error adding upload message",Error,Title}), + rest_helper:error(html_adaptor,'POST',?RESOURCES ++ Path,Request,"<h1>Sorry an error occured uploading your file</h1>") + end; + {error,Error,Resp} -> + error({"Uploading error",Error,Resp}), + rest_helper:error(html_adaptor,'POST',?RESOURCES ++ Path,Request,"<h1>Sorry an error occured uploading your file</h1>"); + _ -> + error({"Upload failure",Path}), + rest_helper:error(html_adaptor,'POST',?RESOURCES ++ Path,Request,"<h1>Sorry an error occured uploading your file</h1>") + end; + {error,Actor,Why} -> + error(Why), + rest_helper:forbidden(?RESOURCES ++ Path,Request,"You do not have the access privelages to upload to this resource") + end + end; + _ -> + error({"Upload failure cannot upload to Resource ",Path}), + rest_helper:error(html_adaptor,'POST',?RESOURCES ++ Path,Request,"<h1>Sorry an error occured uploading your file</h1>") + end; + + react_to(Method,?RESOURCES ++ Path,Request, DocRoot) -> [Dom|Resource] = string:tokens(Path,"/"), Domain = rest_helper:qres(Dom,Request), @@ -175,14 +232,6 @@ react_to(Method,?RESOURCES ++ Path,Request, DocRoot) -> end end; - 'POST' -> - case Path of - _ -> - %ToDo this must move teh temp file to ?RESOURCES sub dir and domain hierarchy - Res = upload:store(Request), - io:format("Upload response ~p~n",[Res]), - Request:respond({200,[{"Content-Type","text/html"}],rest_helper:html("<h1>uploaded</h1>")}) - end; _ -> Request:respond({501, [], []}) end Reactor/src/core/rest_server.erl @@ -3,16 +3,41 @@ -include("system.hrl"). -define(DOSSEPERATOR,"\\"). -define(UNIXSEPERATOR,"/"). --export([store/1]). +-export([store/2,filename/1,name_to_path/2]). -store(Req) -> - reactor_parse_form(Req). +store(Path,Req) -> + reactor_parse_form(Path,Req). -reactor_parse_form(Req) -> - mochiweb_multipart:parse_form(Req,fun reactor_file_handler/2). +reactor_parse_form(Path,Req) -> + io:format("Uploader file handler uploading to ~s~n",[Path]), + case mochiweb_multipart:parse_form(Req,fun reactor_file_handler/2) of + [{_Field1,{Filename,ContentType,Temp}},{_Field2,Title},{_Submit,_Submitval}] -> + move_upload(Filename,Path,Temp,ContentType,Title); + [{_Field2,Title},{_Field1,{Filename,ContentType,Temp}},{_Submit,_Submitval}] -> + move_upload(Filename,Path,Temp,ContentType,Title); + [{_Field2,Title},{_Field1,{Filename,ContentType,Temp}}] -> + move_upload(Filename,Path,Temp,ContentType,Title); + Res -> {error,"Unknown error",Res} + end. + +move_upload(Filename,Path,Temp,ContentType,Title) -> + io:format("Moving uploaded file ~s~n",[Filename]), + case name_to_path(filename(Filename),Path) of + {ok,Dest} -> + case file:rename(Temp, Dest) of + ok -> + {Type,_} = ContentType, + {ok,Dest,Title,Dest -- config_server:path(docroot),Type}; + {error,Error} -> + {error, "File upload internal transfer failed : " ++ Dest ++ ", Error : " ++ atom_to_list(Error)} + end; + {error,Error} -> + {error, "File upload failed : " ++ Filename ++ ", Reason : " ++ atom_to_list(Error)} + end. reactor_file_handler(Filename,ContentType) -> - Temp = uid() ++ ".temp", + Temp = config_server:path(temp) ++ uid() ++ ".tmp", + io:format("Creating temp upload file ~s~n",[Temp]), case file:open(Temp,[raw,write]) of {ok, File} -> reactor_file_handler_1(Filename,ContentType,File,Temp); @@ -35,18 +60,24 @@ reactor_file_handler_1(Filename,ContentType,File,Temp) -> % Utility functions for uploader filename("/" ++ Path) -> name_from_path(Path,?UNIXSEPERATOR); -filename([Drive|Path]) when hd(Path) =:= $: -> - name_from_path(Path,?DOSSEPERATOR). +filename("./" ++ Path) -> + name_from_path(Path,?UNIXSEPERATOR); +filename("../" ++ Path) -> + name_from_path(Path,?UNIXSEPERATOR); +filename([_Drive|Path]) when hd(Path) =:= $: -> + name_from_path(Path,?DOSSEPERATOR); +filename(Path) -> + name_from_path(Path,?UNIXSEPERATOR). name_from_path(Path,Seperator) -> - hd(list:reverse(string:tokens(Path,Seperator))). + hd(lists:reverse(string:tokens(Path,Seperator))). safe(Name) -> {_,S,_} = regexp:gsub(Name,"[^a-zA-Z0-9\-_\.]+","_"), S. name_to_path(Name,Parent) -> - case create_path(string:tokens(Parent,"/"),config_server:path(docroot) ++ ?RESOURCES) of + case create_path(string:tokens(Parent,"/"),rtl(config_server:path(docroot)) ++ rtl(?RESOURCES)) of {ok,Path} -> {ok,Path ++ "/" ++ uid() ++ extension(Name)}; {error,Reason} -> @@ -54,7 +85,7 @@ name_to_path(Name,Parent) -> end. create_path([Item|Items],Path) -> - case file:make_dir(Path ++ Item) of + case file:make_dir(Path ++ "/" ++ Item) of ok -> create_path(Items,Path ++ "/" ++ Item); {error,eexist} -> @@ -71,8 +102,11 @@ extension(Name) -> 0 -> ""; _ -> - hd(list:reverse(string:tokens(Name,"."))) + [$.|hd(lists:reverse(string:tokens(Name,".")))] end. uid() -> attribute:today(). + +rtl(L) -> + lists:reverse(tl(lists:reverse(L))). Reactor/src/core/upload.erl @@ -30,7 +30,7 @@ -include("system.hrl"). -include_lib("stdlib/include/qlc.hrl"). -export([respond/2,error/5,redirect/4,unauthorised/2,forbidden/3]). --export([a/1,qres/2,domain/1,attributes/2,safe_char_set/1,show_login_form/1,show_login_form/2,q/1,repack_acl/3,tag/5,html/1,split/1,item_to_url/1,title/1,safeUri/1,accepts/1,attributes_and_actor/2,credentials/1,cookie/3,cookie_options/2,save_session/2,remove_session/1,get_credentials/1,add_credentials/1,get_option/2,qualified/2]). +-export([a/1,qres/2,domain/1,attributes/2,safe_char_set/1,show_login_form/1,show_login_form/2,q/1,repack_acl/3,tag/5,html/1,split/1,item_to_url/1,title/1,safeUri/1,accepts/1,attributes_and_actor/2,credentials/1,cookie/3,cookie_options/2,save_session/2,remove_session/1,get_credentials/1,add_credentials/1,get_option/2,qualified/2,link/2]). %% Response support functions respond(Request,{ContentType,Body}) -> @@ -132,6 +132,8 @@ credentials(Request) -> get_credentials(UserId) end. + + cookie(Cookie,UserId,Options) -> mochiweb_cookies:cookie(Cookie,UserId,Options). @@ -320,3 +322,6 @@ item_to_url(Item) -> qualified(Domain,Item) -> attribute:item_id(Domain,Item). + +link(Title,Link) -> + "<a href=\"" ++ Link ++ "\" title=\"" ++ Title ++ "\">Download</a>". Reactor/src/rest/rest_helper.erl @@ -32,4 +32,3 @@ puts "Adding users : \n" temp = root.each_element('//user') {|entry| add_user(entry,reactor,domain)} puts "updating acls : \n" temp = root.each_element('//acl') {|entry| add_acl(entry,reactor,domain)} - interfaces/ruby/src/import_acl.rb 765a31fc1d967e5199a675045a5a57406a63973d Alan Wood al@folknology.com http://github.com/folknology/reactored/commit/f8c46dbf61fcb3c9f56198befcfda3e2899cff74 f8c46dbf61fcb3c9f56198befcfda3e2899cff74 2009-03-19T17:34:53-07:00 2009-03-19T17:34:53-07:00 Completed the _resource upload code e1bbe097a60facb920e17cd45ccfa8e53cc4d94a Alan Wood al@folknology.com