Add postgres support, clean code, code review
This commit is contained in:
		
							parent
							
								
									9d3b003add
								
							
						
					
					
						commit
						e51afe4621
					
				
					 19 changed files with 1124 additions and 303 deletions
				
			
		|  | @ -11,11 +11,12 @@ github.com/Unknwon/cae= | |||
| github.com/Unknwon/goconfig= | ||||
| github.com/dchest/scrypt= | ||||
| github.com/go-sql-driver/mysql= | ||||
| github.com/lib/pq= | ||||
| github.com/lunny/xorm= | ||||
| github.com/slene/blackfriday= | ||||
| github.com/gogits/logs= | ||||
| github.com/gogits/binding= | ||||
| github.com/gogits/git= | ||||
| github.com/gogits/gfm= | ||||
| 
 | ||||
| [res] | ||||
| include=templates|public|conf | ||||
|  |  | |||
|  | @ -13,7 +13,8 @@ There are some very good products in this category such as [gitlab](http://gitla | |||
| 
 | ||||
| ## Overview | ||||
| 
 | ||||
| Please see [Wiki](https://github.com/gogits/gogs/wiki) for project design, develop specification, change log and road map. | ||||
| - Please see [Wiki](https://github.com/gogits/gogs/wiki) for project design, develop specification, change log and road map. | ||||
| - See [Trello Broad](https://trello.com/b/uxAoeLUl/gogs-go-git-service) to follow the develop team. | ||||
| 
 | ||||
| ## Features | ||||
| 
 | ||||
|  | @ -24,6 +25,7 @@ Please see [Wiki](https://github.com/gogits/gogs/wiki) for project design, devel | |||
| - User profile page. | ||||
| - Repository viewer. | ||||
| - Gravatar support. | ||||
| - Supports MySQL and PostgreSQL. | ||||
| 
 | ||||
| ## Installation | ||||
| 
 | ||||
|  | @ -40,4 +42,4 @@ There are two ways to install Gogs: | |||
| 
 | ||||
| ## Contributors | ||||
| 
 | ||||
| This project was launched by [Unknown](https://github.com/Unknwon), [lunny](https://github.com/lunny) and [fuxiaohei](https://github.com/fuxiaohei). See [contributors page](https://github.com/gogits/gogs/graphs/contributors) for full list of contributors. | ||||
| This project was launched by [Unknown](https://github.com/Unknwon) and [lunny](https://github.com/lunny); [fuxiaohei](https://github.com/fuxiaohei) and [slene](https://github.com/slene) joined the team soon after. See [contributors page](https://github.com/gogits/gogs/graphs/contributors) for full list of contributors. | ||||
							
								
								
									
										10
									
								
								conf/app.ini
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								conf/app.ini
									
									
									
									
									
								
							|  | @ -1,10 +1,12 @@ | |||
| # App name that shows on every page title | ||||
| APP_NAME = Gogs: Go Git Service | ||||
| # !!MUST CHANGE TO YOUR USER NAME!! | ||||
| RUN_USER = lunny | ||||
| 
 | ||||
| [repository] | ||||
| ROOT = /Users/%(RUN_USER)s/git/gogs-repositories | ||||
| LANG_IGNS=Google Go|C|Python|Ruby | ||||
| LICENSES=Apache v2 License|GPL v2|MIT License|BSD (3-Clause) License | ||||
| LANG_IGNS=Google Go|C|Python|Ruby|C Sharp | ||||
| LICENSES=Apache v2 License|GPL v2|MIT License|Affero GPL|BSD (3-Clause) License | ||||
| 
 | ||||
| [server] | ||||
| DOMAIN = gogits.org | ||||
|  | @ -12,11 +14,15 @@ HTTP_ADDR = | |||
| HTTP_PORT = 3000 | ||||
| 
 | ||||
| [database] | ||||
| # Either "mysql" or "postgres", it's your choice | ||||
| DB_TYPE = mysql | ||||
| HOST =  | ||||
| NAME = gogs | ||||
| USER = root | ||||
| PASSWD = | ||||
| # For "postgres" only, either "disable" or "verify-full" | ||||
| SSL_MODE = disable | ||||
| 
 | ||||
| [security] | ||||
| # !!CHANGE THIS TO KEEP YOUR USER DATA SAFE!! | ||||
| USER_PASSWD_SALT = !#@FDEWREWR&*( | ||||
|  |  | |||
							
								
								
									
										108
									
								
								conf/gitignore/C Sharp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										108
									
								
								conf/gitignore/C Sharp
									
									
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,108 @@ | |||
| # Build Folders (you can keep bin if you'd like, to store dlls and pdbs) | ||||
| [Bb]in/ | ||||
| [Oo]bj/ | ||||
| 
 | ||||
| # mstest test results | ||||
| TestResults | ||||
| 
 | ||||
| ## Ignore Visual Studio temporary files, build results, and | ||||
| ## files generated by popular Visual Studio add-ons. | ||||
| 
 | ||||
| # User-specific files | ||||
| *.suo | ||||
| *.user | ||||
| *.sln.docstates | ||||
| 
 | ||||
| # Build results | ||||
| [Dd]ebug/ | ||||
| [Rr]elease/ | ||||
| x64/ | ||||
| *_i.c | ||||
| *_p.c | ||||
| *.ilk | ||||
| *.meta | ||||
| *.obj | ||||
| *.pch | ||||
| *.pdb | ||||
| *.pgc | ||||
| *.pgd | ||||
| *.rsp | ||||
| *.sbr | ||||
| *.tlb | ||||
| *.tli | ||||
| *.tlh | ||||
| *.tmp | ||||
| *.log | ||||
| *.vspscc | ||||
| *.vssscc | ||||
| .builds | ||||
| 
 | ||||
| # Visual C++ cache files | ||||
| ipch/ | ||||
| *.aps | ||||
| *.ncb | ||||
| *.opensdf | ||||
| *.sdf | ||||
| 
 | ||||
| # Visual Studio profiler | ||||
| *.psess | ||||
| *.vsp | ||||
| *.vspx | ||||
| 
 | ||||
| # Guidance Automation Toolkit | ||||
| *.gpState | ||||
| 
 | ||||
| # ReSharper is a .NET coding add-in | ||||
| _ReSharper* | ||||
| 
 | ||||
| # NCrunch | ||||
| *.ncrunch* | ||||
| .*crunch*.local.xml | ||||
| 
 | ||||
| # Installshield output folder  | ||||
| [Ee]xpress | ||||
| 
 | ||||
| # DocProject is a documentation generator add-in | ||||
| DocProject/buildhelp/ | ||||
| DocProject/Help/*.HxT | ||||
| DocProject/Help/*.HxC | ||||
| DocProject/Help/*.hhc | ||||
| DocProject/Help/*.hhk | ||||
| DocProject/Help/*.hhp | ||||
| DocProject/Help/Html2 | ||||
| DocProject/Help/html | ||||
| 
 | ||||
| # Click-Once directory | ||||
| publish | ||||
| 
 | ||||
| # Publish Web Output | ||||
| *.Publish.xml | ||||
| 
 | ||||
| # NuGet Packages Directory | ||||
| packages | ||||
| 
 | ||||
| # Windows Azure Build Output | ||||
| csx | ||||
| *.build.csdef | ||||
| 
 | ||||
| # Windows Store app package directory | ||||
| AppPackages/ | ||||
| 
 | ||||
| # Others | ||||
| [Bb]in | ||||
| [Oo]bj | ||||
| sql | ||||
| TestResults | ||||
| [Tt]est[Rr]esult* | ||||
| *.Cache | ||||
| ClientBin | ||||
| [Ss]tyle[Cc]op.* | ||||
| ~$* | ||||
| *.dbmdl | ||||
| Generated_Code #added for RIA/Silverlight projects | ||||
| 
 | ||||
| # Backup & report files from converting an old project file to a newer | ||||
| # Visual Studio version. Backup files are not needed, because we have git ;-) | ||||
| _UpgradeReport_Files/ | ||||
| Backup*/ | ||||
| UpgradeLog*.XML | ||||
							
								
								
									
										661
									
								
								conf/license/Affero GPL
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										661
									
								
								conf/license/Affero GPL
									
									
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,661 @@ | |||
| GNU AFFERO GENERAL PUBLIC LICENSE | ||||
|                        Version 3, 19 November 2007 | ||||
| 
 | ||||
|  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> | ||||
|  Everyone is permitted to copy and distribute verbatim copies | ||||
|  of this license document, but changing it is not allowed. | ||||
| 
 | ||||
|                             Preamble | ||||
| 
 | ||||
|   The GNU Affero General Public License is a free, copyleft license for | ||||
| software and other kinds of works, specifically designed to ensure | ||||
| cooperation with the community in the case of network server software. | ||||
| 
 | ||||
|   The licenses for most software and other practical works are designed | ||||
| to take away your freedom to share and change the works.  By contrast, | ||||
| our General Public Licenses are intended to guarantee your freedom to | ||||
| share and change all versions of a program--to make sure it remains free | ||||
| software for all its users. | ||||
| 
 | ||||
|   When we speak of free software, we are referring to freedom, not | ||||
| price.  Our General Public Licenses are designed to make sure that you | ||||
| have the freedom to distribute copies of free software (and charge for | ||||
| them if you wish), that you receive source code or can get it if you | ||||
| want it, that you can change the software or use pieces of it in new | ||||
| free programs, and that you know you can do these things. | ||||
| 
 | ||||
|   Developers that use our General Public Licenses protect your rights | ||||
| with two steps: (1) assert copyright on the software, and (2) offer | ||||
| you this License which gives you legal permission to copy, distribute | ||||
| and/or modify the software. | ||||
| 
 | ||||
|   A secondary benefit of defending all users' freedom is that | ||||
| improvements made in alternate versions of the program, if they | ||||
| receive widespread use, become available for other developers to | ||||
| incorporate.  Many developers of free software are heartened and | ||||
| encouraged by the resulting cooperation.  However, in the case of | ||||
| software used on network servers, this result may fail to come about. | ||||
| The GNU General Public License permits making a modified version and | ||||
| letting the public access it on a server without ever releasing its | ||||
| source code to the public. | ||||
| 
 | ||||
|   The GNU Affero General Public License is designed specifically to | ||||
| ensure that, in such cases, the modified source code becomes available | ||||
| to the community.  It requires the operator of a network server to | ||||
| provide the source code of the modified version running there to the | ||||
| users of that server.  Therefore, public use of a modified version, on | ||||
| a publicly accessible server, gives the public access to the source | ||||
| code of the modified version. | ||||
| 
 | ||||
|   An older license, called the Affero General Public License and | ||||
| published by Affero, was designed to accomplish similar goals.  This is | ||||
| a different license, not a version of the Affero GPL, but Affero has | ||||
| released a new version of the Affero GPL which permits relicensing under | ||||
| this license. | ||||
| 
 | ||||
|   The precise terms and conditions for copying, distribution and | ||||
| modification follow. | ||||
| 
 | ||||
|                        TERMS AND CONDITIONS | ||||
| 
 | ||||
|   0. Definitions. | ||||
| 
 | ||||
|   "This License" refers to version 3 of the GNU Affero General Public License. | ||||
| 
 | ||||
|   "Copyright" also means copyright-like laws that apply to other kinds of | ||||
| works, such as semiconductor masks. | ||||
| 
 | ||||
|   "The Program" refers to any copyrightable work licensed under this | ||||
| License.  Each licensee is addressed as "you".  "Licensees" and | ||||
| "recipients" may be individuals or organizations. | ||||
| 
 | ||||
|   To "modify" a work means to copy from or adapt all or part of the work | ||||
| in a fashion requiring copyright permission, other than the making of an | ||||
| exact copy.  The resulting work is called a "modified version" of the | ||||
| earlier work or a work "based on" the earlier work. | ||||
| 
 | ||||
|   A "covered work" means either the unmodified Program or a work based | ||||
| on the Program. | ||||
| 
 | ||||
|   To "propagate" a work means to do anything with it that, without | ||||
| permission, would make you directly or secondarily liable for | ||||
| infringement under applicable copyright law, except executing it on a | ||||
| computer or modifying a private copy.  Propagation includes copying, | ||||
| distribution (with or without modification), making available to the | ||||
| public, and in some countries other activities as well. | ||||
| 
 | ||||
|   To "convey" a work means any kind of propagation that enables other | ||||
| parties to make or receive copies.  Mere interaction with a user through | ||||
| a computer network, with no transfer of a copy, is not conveying. | ||||
| 
 | ||||
|   An interactive user interface displays "Appropriate Legal Notices" | ||||
| to the extent that it includes a convenient and prominently visible | ||||
| feature that (1) displays an appropriate copyright notice, and (2) | ||||
| tells the user that there is no warranty for the work (except to the | ||||
| extent that warranties are provided), that licensees may convey the | ||||
| work under this License, and how to view a copy of this License.  If | ||||
| the interface presents a list of user commands or options, such as a | ||||
| menu, a prominent item in the list meets this criterion. | ||||
| 
 | ||||
|   1. Source Code. | ||||
| 
 | ||||
|   The "source code" for a work means the preferred form of the work | ||||
| for making modifications to it.  "Object code" means any non-source | ||||
| form of a work. | ||||
| 
 | ||||
|   A "Standard Interface" means an interface that either is an official | ||||
| standard defined by a recognized standards body, or, in the case of | ||||
| interfaces specified for a particular programming language, one that | ||||
| is widely used among developers working in that language. | ||||
| 
 | ||||
|   The "System Libraries" of an executable work include anything, other | ||||
| than the work as a whole, that (a) is included in the normal form of | ||||
| packaging a Major Component, but which is not part of that Major | ||||
| Component, and (b) serves only to enable use of the work with that | ||||
| Major Component, or to implement a Standard Interface for which an | ||||
| implementation is available to the public in source code form.  A | ||||
| "Major Component", in this context, means a major essential component | ||||
| (kernel, window system, and so on) of the specific operating system | ||||
| (if any) on which the executable work runs, or a compiler used to | ||||
| produce the work, or an object code interpreter used to run it. | ||||
| 
 | ||||
|   The "Corresponding Source" for a work in object code form means all | ||||
| the source code needed to generate, install, and (for an executable | ||||
| work) run the object code and to modify the work, including scripts to | ||||
| control those activities.  However, it does not include the work's | ||||
| System Libraries, or general-purpose tools or generally available free | ||||
| programs which are used unmodified in performing those activities but | ||||
| which are not part of the work.  For example, Corresponding Source | ||||
| includes interface definition files associated with source files for | ||||
| the work, and the source code for shared libraries and dynamically | ||||
| linked subprograms that the work is specifically designed to require, | ||||
| such as by intimate data communication or control flow between those | ||||
| subprograms and other parts of the work. | ||||
| 
 | ||||
|   The Corresponding Source need not include anything that users | ||||
| can regenerate automatically from other parts of the Corresponding | ||||
| Source. | ||||
| 
 | ||||
|   The Corresponding Source for a work in source code form is that | ||||
| same work. | ||||
| 
 | ||||
|   2. Basic Permissions. | ||||
| 
 | ||||
|   All rights granted under this License are granted for the term of | ||||
| copyright on the Program, and are irrevocable provided the stated | ||||
| conditions are met.  This License explicitly affirms your unlimited | ||||
| permission to run the unmodified Program.  The output from running a | ||||
| covered work is covered by this License only if the output, given its | ||||
| content, constitutes a covered work.  This License acknowledges your | ||||
| rights of fair use or other equivalent, as provided by copyright law. | ||||
| 
 | ||||
|   You may make, run and propagate covered works that you do not | ||||
| convey, without conditions so long as your license otherwise remains | ||||
| in force.  You may convey covered works to others for the sole purpose | ||||
| of having them make modifications exclusively for you, or provide you | ||||
| with facilities for running those works, provided that you comply with | ||||
| the terms of this License in conveying all material for which you do | ||||
| not control copyright.  Those thus making or running the covered works | ||||
| for you must do so exclusively on your behalf, under your direction | ||||
| and control, on terms that prohibit them from making any copies of | ||||
| your copyrighted material outside their relationship with you. | ||||
| 
 | ||||
|   Conveying under any other circumstances is permitted solely under | ||||
| the conditions stated below.  Sublicensing is not allowed; section 10 | ||||
| makes it unnecessary. | ||||
| 
 | ||||
|   3. Protecting Users' Legal Rights From Anti-Circumvention Law. | ||||
| 
 | ||||
|   No covered work shall be deemed part of an effective technological | ||||
| measure under any applicable law fulfilling obligations under article | ||||
| 11 of the WIPO copyright treaty adopted on 20 December 1996, or | ||||
| similar laws prohibiting or restricting circumvention of such | ||||
| measures. | ||||
| 
 | ||||
|   When you convey a covered work, you waive any legal power to forbid | ||||
| circumvention of technological measures to the extent such circumvention | ||||
| is effected by exercising rights under this License with respect to | ||||
| the covered work, and you disclaim any intention to limit operation or | ||||
| modification of the work as a means of enforcing, against the work's | ||||
| users, your or third parties' legal rights to forbid circumvention of | ||||
| technological measures. | ||||
| 
 | ||||
|   4. Conveying Verbatim Copies. | ||||
| 
 | ||||
|   You may convey verbatim copies of the Program's source code as you | ||||
| receive it, in any medium, provided that you conspicuously and | ||||
| appropriately publish on each copy an appropriate copyright notice; | ||||
| keep intact all notices stating that this License and any | ||||
| non-permissive terms added in accord with section 7 apply to the code; | ||||
| keep intact all notices of the absence of any warranty; and give all | ||||
| recipients a copy of this License along with the Program. | ||||
| 
 | ||||
|   You may charge any price or no price for each copy that you convey, | ||||
| and you may offer support or warranty protection for a fee. | ||||
| 
 | ||||
|   5. Conveying Modified Source Versions. | ||||
| 
 | ||||
|   You may convey a work based on the Program, or the modifications to | ||||
| produce it from the Program, in the form of source code under the | ||||
| terms of section 4, provided that you also meet all of these conditions: | ||||
| 
 | ||||
|     a) The work must carry prominent notices stating that you modified | ||||
|     it, and giving a relevant date. | ||||
| 
 | ||||
|     b) The work must carry prominent notices stating that it is | ||||
|     released under this License and any conditions added under section | ||||
|     7.  This requirement modifies the requirement in section 4 to | ||||
|     "keep intact all notices". | ||||
| 
 | ||||
|     c) You must license the entire work, as a whole, under this | ||||
|     License to anyone who comes into possession of a copy.  This | ||||
|     License will therefore apply, along with any applicable section 7 | ||||
|     additional terms, to the whole of the work, and all its parts, | ||||
|     regardless of how they are packaged.  This License gives no | ||||
|     permission to license the work in any other way, but it does not | ||||
|     invalidate such permission if you have separately received it. | ||||
| 
 | ||||
|     d) If the work has interactive user interfaces, each must display | ||||
|     Appropriate Legal Notices; however, if the Program has interactive | ||||
|     interfaces that do not display Appropriate Legal Notices, your | ||||
|     work need not make them do so. | ||||
| 
 | ||||
|   A compilation of a covered work with other separate and independent | ||||
| works, which are not by their nature extensions of the covered work, | ||||
| and which are not combined with it such as to form a larger program, | ||||
| in or on a volume of a storage or distribution medium, is called an | ||||
| "aggregate" if the compilation and its resulting copyright are not | ||||
| used to limit the access or legal rights of the compilation's users | ||||
| beyond what the individual works permit.  Inclusion of a covered work | ||||
| in an aggregate does not cause this License to apply to the other | ||||
| parts of the aggregate. | ||||
| 
 | ||||
|   6. Conveying Non-Source Forms. | ||||
| 
 | ||||
|   You may convey a covered work in object code form under the terms | ||||
| of sections 4 and 5, provided that you also convey the | ||||
| machine-readable Corresponding Source under the terms of this License, | ||||
| in one of these ways: | ||||
| 
 | ||||
|     a) Convey the object code in, or embodied in, a physical product | ||||
|     (including a physical distribution medium), accompanied by the | ||||
|     Corresponding Source fixed on a durable physical medium | ||||
|     customarily used for software interchange. | ||||
| 
 | ||||
|     b) Convey the object code in, or embodied in, a physical product | ||||
|     (including a physical distribution medium), accompanied by a | ||||
|     written offer, valid for at least three years and valid for as | ||||
|     long as you offer spare parts or customer support for that product | ||||
|     model, to give anyone who possesses the object code either (1) a | ||||
|     copy of the Corresponding Source for all the software in the | ||||
|     product that is covered by this License, on a durable physical | ||||
|     medium customarily used for software interchange, for a price no | ||||
|     more than your reasonable cost of physically performing this | ||||
|     conveying of source, or (2) access to copy the | ||||
|     Corresponding Source from a network server at no charge. | ||||
| 
 | ||||
|     c) Convey individual copies of the object code with a copy of the | ||||
|     written offer to provide the Corresponding Source.  This | ||||
|     alternative is allowed only occasionally and noncommercially, and | ||||
|     only if you received the object code with such an offer, in accord | ||||
|     with subsection 6b. | ||||
| 
 | ||||
|     d) Convey the object code by offering access from a designated | ||||
|     place (gratis or for a charge), and offer equivalent access to the | ||||
|     Corresponding Source in the same way through the same place at no | ||||
|     further charge.  You need not require recipients to copy the | ||||
|     Corresponding Source along with the object code.  If the place to | ||||
|     copy the object code is a network server, the Corresponding Source | ||||
|     may be on a different server (operated by you or a third party) | ||||
|     that supports equivalent copying facilities, provided you maintain | ||||
|     clear directions next to the object code saying where to find the | ||||
|     Corresponding Source.  Regardless of what server hosts the | ||||
|     Corresponding Source, you remain obligated to ensure that it is | ||||
|     available for as long as needed to satisfy these requirements. | ||||
| 
 | ||||
|     e) Convey the object code using peer-to-peer transmission, provided | ||||
|     you inform other peers where the object code and Corresponding | ||||
|     Source of the work are being offered to the general public at no | ||||
|     charge under subsection 6d. | ||||
| 
 | ||||
|   A separable portion of the object code, whose source code is excluded | ||||
| from the Corresponding Source as a System Library, need not be | ||||
| included in conveying the object code work. | ||||
| 
 | ||||
|   A "User Product" is either (1) a "consumer product", which means any | ||||
| tangible personal property which is normally used for personal, family, | ||||
| or household purposes, or (2) anything designed or sold for incorporation | ||||
| into a dwelling.  In determining whether a product is a consumer product, | ||||
| doubtful cases shall be resolved in favor of coverage.  For a particular | ||||
| product received by a particular user, "normally used" refers to a | ||||
| typical or common use of that class of product, regardless of the status | ||||
| of the particular user or of the way in which the particular user | ||||
| actually uses, or expects or is expected to use, the product.  A product | ||||
| is a consumer product regardless of whether the product has substantial | ||||
| commercial, industrial or non-consumer uses, unless such uses represent | ||||
| the only significant mode of use of the product. | ||||
| 
 | ||||
|   "Installation Information" for a User Product means any methods, | ||||
| procedures, authorization keys, or other information required to install | ||||
| and execute modified versions of a covered work in that User Product from | ||||
| a modified version of its Corresponding Source.  The information must | ||||
| suffice to ensure that the continued functioning of the modified object | ||||
| code is in no case prevented or interfered with solely because | ||||
| modification has been made. | ||||
| 
 | ||||
|   If you convey an object code work under this section in, or with, or | ||||
| specifically for use in, a User Product, and the conveying occurs as | ||||
| part of a transaction in which the right of possession and use of the | ||||
| User Product is transferred to the recipient in perpetuity or for a | ||||
| fixed term (regardless of how the transaction is characterized), the | ||||
| Corresponding Source conveyed under this section must be accompanied | ||||
| by the Installation Information.  But this requirement does not apply | ||||
| if neither you nor any third party retains the ability to install | ||||
| modified object code on the User Product (for example, the work has | ||||
| been installed in ROM). | ||||
| 
 | ||||
|   The requirement to provide Installation Information does not include a | ||||
| requirement to continue to provide support service, warranty, or updates | ||||
| for a work that has been modified or installed by the recipient, or for | ||||
| the User Product in which it has been modified or installed.  Access to a | ||||
| network may be denied when the modification itself materially and | ||||
| adversely affects the operation of the network or violates the rules and | ||||
| protocols for communication across the network. | ||||
| 
 | ||||
|   Corresponding Source conveyed, and Installation Information provided, | ||||
| in accord with this section must be in a format that is publicly | ||||
| documented (and with an implementation available to the public in | ||||
| source code form), and must require no special password or key for | ||||
| unpacking, reading or copying. | ||||
| 
 | ||||
|   7. Additional Terms. | ||||
| 
 | ||||
|   "Additional permissions" are terms that supplement the terms of this | ||||
| License by making exceptions from one or more of its conditions. | ||||
| Additional permissions that are applicable to the entire Program shall | ||||
| be treated as though they were included in this License, to the extent | ||||
| that they are valid under applicable law.  If additional permissions | ||||
| apply only to part of the Program, that part may be used separately | ||||
| under those permissions, but the entire Program remains governed by | ||||
| this License without regard to the additional permissions. | ||||
| 
 | ||||
|   When you convey a copy of a covered work, you may at your option | ||||
| remove any additional permissions from that copy, or from any part of | ||||
| it.  (Additional permissions may be written to require their own | ||||
| removal in certain cases when you modify the work.)  You may place | ||||
| additional permissions on material, added by you to a covered work, | ||||
| for which you have or can give appropriate copyright permission. | ||||
| 
 | ||||
|   Notwithstanding any other provision of this License, for material you | ||||
| add to a covered work, you may (if authorized by the copyright holders of | ||||
| that material) supplement the terms of this License with terms: | ||||
| 
 | ||||
|     a) Disclaiming warranty or limiting liability differently from the | ||||
|     terms of sections 15 and 16 of this License; or | ||||
| 
 | ||||
|     b) Requiring preservation of specified reasonable legal notices or | ||||
|     author attributions in that material or in the Appropriate Legal | ||||
|     Notices displayed by works containing it; or | ||||
| 
 | ||||
|     c) Prohibiting misrepresentation of the origin of that material, or | ||||
|     requiring that modified versions of such material be marked in | ||||
|     reasonable ways as different from the original version; or | ||||
| 
 | ||||
|     d) Limiting the use for publicity purposes of names of licensors or | ||||
|     authors of the material; or | ||||
| 
 | ||||
|     e) Declining to grant rights under trademark law for use of some | ||||
|     trade names, trademarks, or service marks; or | ||||
| 
 | ||||
|     f) Requiring indemnification of licensors and authors of that | ||||
|     material by anyone who conveys the material (or modified versions of | ||||
|     it) with contractual assumptions of liability to the recipient, for | ||||
|     any liability that these contractual assumptions directly impose on | ||||
|     those licensors and authors. | ||||
| 
 | ||||
|   All other non-permissive additional terms are considered "further | ||||
| restrictions" within the meaning of section 10.  If the Program as you | ||||
| received it, or any part of it, contains a notice stating that it is | ||||
| governed by this License along with a term that is a further | ||||
| restriction, you may remove that term.  If a license document contains | ||||
| a further restriction but permits relicensing or conveying under this | ||||
| License, you may add to a covered work material governed by the terms | ||||
| of that license document, provided that the further restriction does | ||||
| not survive such relicensing or conveying. | ||||
| 
 | ||||
|   If you add terms to a covered work in accord with this section, you | ||||
| must place, in the relevant source files, a statement of the | ||||
| additional terms that apply to those files, or a notice indicating | ||||
| where to find the applicable terms. | ||||
| 
 | ||||
|   Additional terms, permissive or non-permissive, may be stated in the | ||||
| form of a separately written license, or stated as exceptions; | ||||
| the above requirements apply either way. | ||||
| 
 | ||||
|   8. Termination. | ||||
| 
 | ||||
|   You may not propagate or modify a covered work except as expressly | ||||
| provided under this License.  Any attempt otherwise to propagate or | ||||
| modify it is void, and will automatically terminate your rights under | ||||
| this License (including any patent licenses granted under the third | ||||
| paragraph of section 11). | ||||
| 
 | ||||
|   However, if you cease all violation of this License, then your | ||||
| license from a particular copyright holder is reinstated (a) | ||||
| provisionally, unless and until the copyright holder explicitly and | ||||
| finally terminates your license, and (b) permanently, if the copyright | ||||
| holder fails to notify you of the violation by some reasonable means | ||||
| prior to 60 days after the cessation. | ||||
| 
 | ||||
|   Moreover, your license from a particular copyright holder is | ||||
| reinstated permanently if the copyright holder notifies you of the | ||||
| violation by some reasonable means, this is the first time you have | ||||
| received notice of violation of this License (for any work) from that | ||||
| copyright holder, and you cure the violation prior to 30 days after | ||||
| your receipt of the notice. | ||||
| 
 | ||||
|   Termination of your rights under this section does not terminate the | ||||
| licenses of parties who have received copies or rights from you under | ||||
| this License.  If your rights have been terminated and not permanently | ||||
| reinstated, you do not qualify to receive new licenses for the same | ||||
| material under section 10. | ||||
| 
 | ||||
|   9. Acceptance Not Required for Having Copies. | ||||
| 
 | ||||
|   You are not required to accept this License in order to receive or | ||||
| run a copy of the Program.  Ancillary propagation of a covered work | ||||
| occurring solely as a consequence of using peer-to-peer transmission | ||||
| to receive a copy likewise does not require acceptance.  However, | ||||
| nothing other than this License grants you permission to propagate or | ||||
| modify any covered work.  These actions infringe copyright if you do | ||||
| not accept this License.  Therefore, by modifying or propagating a | ||||
| covered work, you indicate your acceptance of this License to do so. | ||||
| 
 | ||||
|   10. Automatic Licensing of Downstream Recipients. | ||||
| 
 | ||||
|   Each time you convey a covered work, the recipient automatically | ||||
| receives a license from the original licensors, to run, modify and | ||||
| propagate that work, subject to this License.  You are not responsible | ||||
| for enforcing compliance by third parties with this License. | ||||
| 
 | ||||
|   An "entity transaction" is a transaction transferring control of an | ||||
| organization, or substantially all assets of one, or subdividing an | ||||
| organization, or merging organizations.  If propagation of a covered | ||||
| work results from an entity transaction, each party to that | ||||
| transaction who receives a copy of the work also receives whatever | ||||
| licenses to the work the party's predecessor in interest had or could | ||||
| give under the previous paragraph, plus a right to possession of the | ||||
| Corresponding Source of the work from the predecessor in interest, if | ||||
| the predecessor has it or can get it with reasonable efforts. | ||||
| 
 | ||||
|   You may not impose any further restrictions on the exercise of the | ||||
| rights granted or affirmed under this License.  For example, you may | ||||
| not impose a license fee, royalty, or other charge for exercise of | ||||
| rights granted under this License, and you may not initiate litigation | ||||
| (including a cross-claim or counterclaim in a lawsuit) alleging that | ||||
| any patent claim is infringed by making, using, selling, offering for | ||||
| sale, or importing the Program or any portion of it. | ||||
| 
 | ||||
|   11. Patents. | ||||
| 
 | ||||
|   A "contributor" is a copyright holder who authorizes use under this | ||||
| License of the Program or a work on which the Program is based.  The | ||||
| work thus licensed is called the contributor's "contributor version". | ||||
| 
 | ||||
|   A contributor's "essential patent claims" are all patent claims | ||||
| owned or controlled by the contributor, whether already acquired or | ||||
| hereafter acquired, that would be infringed by some manner, permitted | ||||
| by this License, of making, using, or selling its contributor version, | ||||
| but do not include claims that would be infringed only as a | ||||
| consequence of further modification of the contributor version.  For | ||||
| purposes of this definition, "control" includes the right to grant | ||||
| patent sublicenses in a manner consistent with the requirements of | ||||
| this License. | ||||
| 
 | ||||
|   Each contributor grants you a non-exclusive, worldwide, royalty-free | ||||
| patent license under the contributor's essential patent claims, to | ||||
| make, use, sell, offer for sale, import and otherwise run, modify and | ||||
| propagate the contents of its contributor version. | ||||
| 
 | ||||
|   In the following three paragraphs, a "patent license" is any express | ||||
| agreement or commitment, however denominated, not to enforce a patent | ||||
| (such as an express permission to practice a patent or covenant not to | ||||
| sue for patent infringement).  To "grant" such a patent license to a | ||||
| party means to make such an agreement or commitment not to enforce a | ||||
| patent against the party. | ||||
| 
 | ||||
|   If you convey a covered work, knowingly relying on a patent license, | ||||
| and the Corresponding Source of the work is not available for anyone | ||||
| to copy, free of charge and under the terms of this License, through a | ||||
| publicly available network server or other readily accessible means, | ||||
| then you must either (1) cause the Corresponding Source to be so | ||||
| available, or (2) arrange to deprive yourself of the benefit of the | ||||
| patent license for this particular work, or (3) arrange, in a manner | ||||
| consistent with the requirements of this License, to extend the patent | ||||
| license to downstream recipients.  "Knowingly relying" means you have | ||||
| actual knowledge that, but for the patent license, your conveying the | ||||
| covered work in a country, or your recipient's use of the covered work | ||||
| in a country, would infringe one or more identifiable patents in that | ||||
| country that you have reason to believe are valid. | ||||
| 
 | ||||
|   If, pursuant to or in connection with a single transaction or | ||||
| arrangement, you convey, or propagate by procuring conveyance of, a | ||||
| covered work, and grant a patent license to some of the parties | ||||
| receiving the covered work authorizing them to use, propagate, modify | ||||
| or convey a specific copy of the covered work, then the patent license | ||||
| you grant is automatically extended to all recipients of the covered | ||||
| work and works based on it. | ||||
| 
 | ||||
|   A patent license is "discriminatory" if it does not include within | ||||
| the scope of its coverage, prohibits the exercise of, or is | ||||
| conditioned on the non-exercise of one or more of the rights that are | ||||
| specifically granted under this License.  You may not convey a covered | ||||
| work if you are a party to an arrangement with a third party that is | ||||
| in the business of distributing software, under which you make payment | ||||
| to the third party based on the extent of your activity of conveying | ||||
| the work, and under which the third party grants, to any of the | ||||
| parties who would receive the covered work from you, a discriminatory | ||||
| patent license (a) in connection with copies of the covered work | ||||
| conveyed by you (or copies made from those copies), or (b) primarily | ||||
| for and in connection with specific products or compilations that | ||||
| contain the covered work, unless you entered into that arrangement, | ||||
| or that patent license was granted, prior to 28 March 2007. | ||||
| 
 | ||||
|   Nothing in this License shall be construed as excluding or limiting | ||||
| any implied license or other defenses to infringement that may | ||||
| otherwise be available to you under applicable patent law. | ||||
| 
 | ||||
|   12. No Surrender of Others' Freedom. | ||||
| 
 | ||||
|   If conditions are imposed on you (whether by court order, agreement or | ||||
| otherwise) that contradict the conditions of this License, they do not | ||||
| excuse you from the conditions of this License.  If you cannot convey a | ||||
| covered work so as to satisfy simultaneously your obligations under this | ||||
| License and any other pertinent obligations, then as a consequence you may | ||||
| not convey it at all.  For example, if you agree to terms that obligate you | ||||
| to collect a royalty for further conveying from those to whom you convey | ||||
| the Program, the only way you could satisfy both those terms and this | ||||
| License would be to refrain entirely from conveying the Program. | ||||
| 
 | ||||
|   13. Remote Network Interaction; Use with the GNU General Public License. | ||||
| 
 | ||||
|   Notwithstanding any other provision of this License, if you modify the | ||||
| Program, your modified version must prominently offer all users | ||||
| interacting with it remotely through a computer network (if your version | ||||
| supports such interaction) an opportunity to receive the Corresponding | ||||
| Source of your version by providing access to the Corresponding Source | ||||
| from a network server at no charge, through some standard or customary | ||||
| means of facilitating copying of software.  This Corresponding Source | ||||
| shall include the Corresponding Source for any work covered by version 3 | ||||
| of the GNU General Public License that is incorporated pursuant to the | ||||
| following paragraph. | ||||
| 
 | ||||
|   Notwithstanding any other provision of this License, you have | ||||
| permission to link or combine any covered work with a work licensed | ||||
| under version 3 of the GNU General Public License into a single | ||||
| combined work, and to convey the resulting work.  The terms of this | ||||
| License will continue to apply to the part which is the covered work, | ||||
| but the work with which it is combined will remain governed by version | ||||
| 3 of the GNU General Public License. | ||||
| 
 | ||||
|   14. Revised Versions of this License. | ||||
| 
 | ||||
|   The Free Software Foundation may publish revised and/or new versions of | ||||
| the GNU Affero General Public License from time to time.  Such new versions | ||||
| will be similar in spirit to the present version, but may differ in detail to | ||||
| address new problems or concerns. | ||||
| 
 | ||||
|   Each version is given a distinguishing version number.  If the | ||||
| Program specifies that a certain numbered version of the GNU Affero General | ||||
| Public License "or any later version" applies to it, you have the | ||||
| option of following the terms and conditions either of that numbered | ||||
| version or of any later version published by the Free Software | ||||
| Foundation.  If the Program does not specify a version number of the | ||||
| GNU Affero General Public License, you may choose any version ever published | ||||
| by the Free Software Foundation. | ||||
| 
 | ||||
|   If the Program specifies that a proxy can decide which future | ||||
| versions of the GNU Affero General Public License can be used, that proxy's | ||||
| public statement of acceptance of a version permanently authorizes you | ||||
| to choose that version for the Program. | ||||
| 
 | ||||
|   Later license versions may give you additional or different | ||||
| permissions.  However, no additional obligations are imposed on any | ||||
| author or copyright holder as a result of your choosing to follow a | ||||
| later version. | ||||
| 
 | ||||
|   15. Disclaimer of Warranty. | ||||
| 
 | ||||
|   THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY | ||||
| APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT | ||||
| HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY | ||||
| OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, | ||||
| THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||||
| PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM | ||||
| IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF | ||||
| ALL NECESSARY SERVICING, REPAIR OR CORRECTION. | ||||
| 
 | ||||
|   16. Limitation of Liability. | ||||
| 
 | ||||
|   IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING | ||||
| WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS | ||||
| THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY | ||||
| GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE | ||||
| USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF | ||||
| DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD | ||||
| PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), | ||||
| EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF | ||||
| SUCH DAMAGES. | ||||
| 
 | ||||
|   17. Interpretation of Sections 15 and 16. | ||||
| 
 | ||||
|   If the disclaimer of warranty and limitation of liability provided | ||||
| above cannot be given local legal effect according to their terms, | ||||
| reviewing courts shall apply local law that most closely approximates | ||||
| an absolute waiver of all civil liability in connection with the | ||||
| Program, unless a warranty or assumption of liability accompanies a | ||||
| copy of the Program in return for a fee. | ||||
| 
 | ||||
|                      END OF TERMS AND CONDITIONS | ||||
| 
 | ||||
|             How to Apply These Terms to Your New Programs | ||||
| 
 | ||||
|   If you develop a new program, and you want it to be of the greatest | ||||
| possible use to the public, the best way to achieve this is to make it | ||||
| free software which everyone can redistribute and change under these terms. | ||||
| 
 | ||||
|   To do so, attach the following notices to the program.  It is safest | ||||
| to attach them to the start of each source file to most effectively | ||||
| state the exclusion of warranty; and each file should have at least | ||||
| the "copyright" line and a pointer to where the full notice is found. | ||||
| 
 | ||||
|     <one line to give the program's name and a brief idea of what it does.> | ||||
|     Copyright (C) <year>  <name of author> | ||||
| 
 | ||||
|     This program is free software: you can redistribute it and/or modify | ||||
|     it under the terms of the GNU Affero General Public License as published | ||||
|     by the Free Software Foundation, either version 3 of the License, or | ||||
|     (at your option) any later version. | ||||
| 
 | ||||
|     This program 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 Affero General Public License for more details. | ||||
| 
 | ||||
|     You should have received a copy of the GNU Affero General Public License | ||||
|     along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| 
 | ||||
| Also add information on how to contact you by electronic and paper mail. | ||||
| 
 | ||||
|   If your software can interact with users remotely through a computer | ||||
| network, you should also make sure that it provides a way for users to | ||||
| get its source.  For example, if your program is a web application, its | ||||
| interface could display a "Source" link that leads users to an archive | ||||
| of the code.  There are many ways you could offer source, and different | ||||
| solutions will be better for different programs; see section 13 for the | ||||
| specific requirements. | ||||
| 
 | ||||
|   You should also get your employer (if you work as a programmer) or school, | ||||
| if any, to sign a "copyright disclaimer" for the program, if necessary. | ||||
| For more information on this, and how to apply and follow the GNU AGPL, see | ||||
| <http://www.gnu.org/licenses/>. | ||||
							
								
								
									
										2
									
								
								gogs.go
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								gogs.go
									
									
									
									
									
								
							|  | @ -20,7 +20,7 @@ import ( | |||
| // Test that go1.1 tag above is included in builds. main.go refers to this definition.
 | ||||
| const go11tag = true | ||||
| 
 | ||||
| const APP_VER = "0.0.9.0317.1" | ||||
| const APP_VER = "0.1.0.0317.1" | ||||
| 
 | ||||
| func init() { | ||||
| 	base.AppVer = APP_VER | ||||
|  |  | |||
|  | @ -9,11 +9,13 @@ import ( | |||
| 	"time" | ||||
| ) | ||||
| 
 | ||||
| // Access types.
 | ||||
| const ( | ||||
| 	AU_READABLE = iota + 1 | ||||
| 	AU_WRITABLE | ||||
| ) | ||||
| 
 | ||||
| // Access represents the accessibility of user and repository.
 | ||||
| type Access struct { | ||||
| 	Id       int64 | ||||
| 	UserName string    `xorm:"unique(s)"` | ||||
|  | @ -22,12 +24,13 @@ type Access struct { | |||
| 	Created  time.Time `xorm:"created"` | ||||
| } | ||||
| 
 | ||||
| // AddAccess adds new access record.
 | ||||
| func AddAccess(access *Access) error { | ||||
| 	_, err := orm.Insert(access) | ||||
| 	return err | ||||
| } | ||||
| 
 | ||||
| // if one user can read or write one repository
 | ||||
| // HasAccess returns true if someone can read or write given repository.
 | ||||
| func HasAccess(userName, repoName string, mode int) (bool, error) { | ||||
| 	return orm.Get(&Access{ | ||||
| 		Id:       0, | ||||
|  |  | |||
|  | @ -19,7 +19,7 @@ const ( | |||
| 	OP_PULL_REQUEST | ||||
| ) | ||||
| 
 | ||||
| // An Action represents
 | ||||
| // Action represents user operation type and information to the repository.
 | ||||
| type Action struct { | ||||
| 	Id          int64 | ||||
| 	UserId      int64 // Receiver user id.
 | ||||
|  |  | |||
|  | @ -7,10 +7,9 @@ package models | |||
| import ( | ||||
| 	"fmt" | ||||
| 	"os" | ||||
| 	"path/filepath" | ||||
| 
 | ||||
| 	"github.com/Unknwon/com" | ||||
| 	_ "github.com/go-sql-driver/mysql" | ||||
| 	_ "github.com/lib/pq" | ||||
| 	"github.com/lunny/xorm" | ||||
| 
 | ||||
| 	"github.com/gogits/gogs/modules/base" | ||||
|  | @ -47,54 +46,50 @@ func setEngine() { | |||
| 	dbName := base.Cfg.MustValue("database", "NAME") | ||||
| 	dbUser := base.Cfg.MustValue("database", "USER") | ||||
| 	dbPwd := base.Cfg.MustValue("database", "PASSWD") | ||||
| 	sslMode := base.Cfg.MustValue("database", "SSL_MODE") | ||||
| 
 | ||||
| 	var err error | ||||
| 	switch dbType { | ||||
| 	case "mysql": | ||||
| 		orm, err = xorm.NewEngine("mysql", fmt.Sprintf("%v:%v@%v/%v?charset=utf8", | ||||
| 		orm, err = xorm.NewEngine("mysql", fmt.Sprintf("%s:%s@%s/%s?charset=utf8", | ||||
| 			dbUser, dbPwd, dbHost, dbName)) | ||||
| 	case "postgres": | ||||
| 		orm, err = xorm.NewEngine("postgres", fmt.Sprintf("user=%s password=%s dbname=%s sslmode=%s", | ||||
| 			dbUser, dbPwd, dbName, sslMode)) | ||||
| 	default: | ||||
| 		fmt.Printf("Unknown database type: %s\n", dbType) | ||||
| 		os.Exit(2) | ||||
| 	} | ||||
| 
 | ||||
| 	if err != nil { | ||||
| 		fmt.Printf("models.init -> fail to conntect database: %s\n", dbType) | ||||
| 		fmt.Printf("models.init(fail to conntect database): %v\n", err) | ||||
| 		os.Exit(2) | ||||
| 	} | ||||
| 
 | ||||
| 	//TODO: for serv command, MUST remove the output to os.stdout, so
 | ||||
| 	// TODO: for serv command, MUST remove the output to os.stdout, so
 | ||||
| 	// use log file to instead print to stdout
 | ||||
| 
 | ||||
| 	//x.ShowDebug = true
 | ||||
| 	//orm.ShowErr = true
 | ||||
| 	f, _ := os.Create("xorm.log") | ||||
| 	f, err := os.Create("xorm.log") | ||||
| 	if err != nil { | ||||
| 		fmt.Printf("models.init(fail to create xorm.log): %v\n", err) | ||||
| 		os.Exit(2) | ||||
| 	} | ||||
| 	orm.Logger = f | ||||
| 	orm.ShowSQL = true | ||||
| 
 | ||||
| 	// Determine and create root git reposiroty path.
 | ||||
| 	RepoRootPath = base.Cfg.MustValue("repository", "ROOT") | ||||
| 	if err = os.MkdirAll(RepoRootPath, os.ModePerm); err != nil { | ||||
| 		fmt.Printf("models.init -> fail to create RepoRootPath(%s): %v\n", RepoRootPath, err) | ||||
| 		os.Exit(2) | ||||
| 	} | ||||
| 
 | ||||
| 	homeDir, err := com.HomeDir() | ||||
| 	if err != nil { | ||||
| 		fmt.Printf("models.init -> fail to get homeDir: %v\n", err) | ||||
| 		os.Exit(2) | ||||
| 	} | ||||
| 	sshPath := filepath.Join(homeDir, ".ssh") | ||||
| 	if err = os.MkdirAll(sshPath, os.ModePerm); err != nil { | ||||
| 		fmt.Printf("models.init -> fail to create sshPath(%s): %v\n", sshPath, err) | ||||
| 		fmt.Printf("models.init(fail to create RepoRootPath(%s)): %v\n", RepoRootPath, err) | ||||
| 		os.Exit(2) | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
| func init() { | ||||
| 	setEngine() | ||||
| 	err := orm.Sync(new(User), new(PublicKey), new(Repository), new(Access), new(Action)) | ||||
| 	if err != nil { | ||||
| 		fmt.Printf("sync database struct error: %s\n", err) | ||||
| 	if err := orm.Sync(new(User), new(PublicKey), new(Repository), new(Access), new(Action)); err != nil { | ||||
| 		fmt.Printf("sync database struct error: %v\n", err) | ||||
| 		os.Exit(2) | ||||
| 	} | ||||
| } | ||||
|  |  | |||
|  | @ -9,6 +9,7 @@ import ( | |||
| 	"errors" | ||||
| 	"fmt" | ||||
| 	"io" | ||||
| 	"io/ioutil" | ||||
| 	"os" | ||||
| 	"os/exec" | ||||
| 	"path" | ||||
|  | @ -20,16 +21,19 @@ import ( | |||
| 	"github.com/Unknwon/com" | ||||
| ) | ||||
| 
 | ||||
| var ( | ||||
| 	sshOpLocker = sync.Mutex{} | ||||
| 	//publicKeyRootPath string
 | ||||
| 	sshPath string | ||||
| 	appPath string | ||||
| const ( | ||||
| 	// "### autogenerated by gitgos, DO NOT EDIT\n"
 | ||||
| 	tmplPublicKey = "command=\"%s serv key-%d\",no-port-forwarding," + | ||||
| 		"no-X11-forwarding,no-agent-forwarding,no-pty %s\n" | ||||
| 	TPL_PUBLICK_KEY = `command="%s serv key-%d",no-port-forwarding, no-X11-forwarding,no-agent-forwarding,no-pty %s` | ||||
| ) | ||||
| 
 | ||||
| var ( | ||||
| 	sshOpLocker = sync.Mutex{} | ||||
| 
 | ||||
| 	sshPath string | ||||
| 	appPath string | ||||
| ) | ||||
| 
 | ||||
| // exePath returns the executable path.
 | ||||
| func exePath() (string, error) { | ||||
| 	file, err := exec.LookPath(os.Args[0]) | ||||
| 	if err != nil { | ||||
|  | @ -38,6 +42,7 @@ func exePath() (string, error) { | |||
| 	return filepath.Abs(file) | ||||
| } | ||||
| 
 | ||||
| // homeDir returns the home directory of current user.
 | ||||
| func homeDir() string { | ||||
| 	home, err := com.HomeDir() | ||||
| 	if err != nil { | ||||
|  | @ -48,15 +53,22 @@ func homeDir() string { | |||
| 
 | ||||
| func init() { | ||||
| 	var err error | ||||
| 
 | ||||
| 	appPath, err = exePath() | ||||
| 	if err != nil { | ||||
| 		println(err.Error()) | ||||
| 		fmt.Printf("publickey.init(fail to get app path): %v\n", err) | ||||
| 		os.Exit(2) | ||||
| 	} | ||||
| 
 | ||||
| 	// Determine and create .ssh path.
 | ||||
| 	sshPath = filepath.Join(homeDir(), ".ssh") | ||||
| 	if err = os.MkdirAll(sshPath, os.ModePerm); err != nil { | ||||
| 		fmt.Printf("publickey.init(fail to create sshPath(%s)): %v\n", sshPath, err) | ||||
| 		os.Exit(2) | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
| // PublicKey represents a SSH key of user.
 | ||||
| type PublicKey struct { | ||||
| 	Id          int64 | ||||
| 	OwnerId     int64  `xorm:"index"` | ||||
|  | @ -71,10 +83,12 @@ var ( | |||
| 	ErrKeyAlreadyExist = errors.New("Public key already exist") | ||||
| ) | ||||
| 
 | ||||
| // GenAuthorizedKey returns formatted public key string.
 | ||||
| func GenAuthorizedKey(keyId int64, key string) string { | ||||
| 	return fmt.Sprintf(tmplPublicKey, appPath, keyId, key) | ||||
| 	return fmt.Sprintf(TPL_PUBLICK_KEY+"\n", appPath, keyId, key) | ||||
| } | ||||
| 
 | ||||
| // AddPublicKey adds new public key to database and SSH key file.
 | ||||
| func AddPublicKey(key *PublicKey) (err error) { | ||||
| 	// Check if public key name has been used.
 | ||||
| 	has, err := orm.Get(key) | ||||
|  | @ -88,14 +102,9 @@ func AddPublicKey(key *PublicKey) (err error) { | |||
| 	tmpPath := filepath.Join(os.TempDir(), fmt.Sprintf("%d", time.Now().Nanosecond()), | ||||
| 		"id_rsa.pub") | ||||
| 	os.MkdirAll(path.Dir(tmpPath), os.ModePerm) | ||||
| 	f, err := os.Create(tmpPath) | ||||
| 	if err != nil { | ||||
| 		return | ||||
| 	} | ||||
| 	if _, err = f.WriteString(key.Content); err != nil { | ||||
| 	if err = ioutil.WriteFile(tmpPath, []byte(key.Content), os.ModePerm); err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 	f.Close() | ||||
| 	stdout, _, err := com.ExecCmd("ssh-keygen", "-l", "-f", tmpPath) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
|  | @ -108,7 +117,6 @@ func AddPublicKey(key *PublicKey) (err error) { | |||
| 	if _, err = orm.Insert(key); err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 
 | ||||
| 	if err = SaveAuthorizedKeyFile(key); err != nil { | ||||
| 		if _, err2 := orm.Delete(key); err2 != nil { | ||||
| 			return err2 | ||||
|  | @ -121,6 +129,7 @@ func AddPublicKey(key *PublicKey) (err error) { | |||
| 
 | ||||
| // DeletePublicKey deletes SSH key information both in database and authorized_keys file.
 | ||||
| func DeletePublicKey(key *PublicKey) (err error) { | ||||
| 	// Delete SSH key in database.
 | ||||
| 	has, err := orm.Id(key.Id).Get(key) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
|  | @ -131,6 +140,7 @@ func DeletePublicKey(key *PublicKey) (err error) { | |||
| 		return err | ||||
| 	} | ||||
| 
 | ||||
| 	// Delete SSH key in SSH key file.
 | ||||
| 	sshOpLocker.Lock() | ||||
| 	defer sshOpLocker.Unlock() | ||||
| 
 | ||||
|  | @ -182,16 +192,17 @@ func DeletePublicKey(key *PublicKey) (err error) { | |||
| 	if err = os.Remove(p); err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 
 | ||||
| 	return os.Rename(tmpP, p) | ||||
| } | ||||
| 
 | ||||
| // ListPublicKey returns a list of public keys that user has.
 | ||||
| func ListPublicKey(userId int64) ([]PublicKey, error) { | ||||
| 	keys := make([]PublicKey, 0) | ||||
| 	err := orm.Find(&keys, &PublicKey{OwnerId: userId}) | ||||
| 	return keys, err | ||||
| } | ||||
| 
 | ||||
| // SaveAuthorizedKeyFile writes SSH key content to SSH key file.
 | ||||
| func SaveAuthorizedKeyFile(key *PublicKey) error { | ||||
| 	sshOpLocker.Lock() | ||||
| 	defer sshOpLocker.Unlock() | ||||
|  | @ -203,7 +214,6 @@ func SaveAuthorizedKeyFile(key *PublicKey) error { | |||
| 	} | ||||
| 	defer f.Close() | ||||
| 
 | ||||
| 	//os.Chmod(p, 0600)
 | ||||
| 	_, err = f.WriteString(GenAuthorizedKey(key.Id, key.Content)) | ||||
| 	return err | ||||
| } | ||||
|  |  | |||
							
								
								
									
										241
									
								
								models/repo.go
									
									
									
									
									
								
							
							
						
						
									
										241
									
								
								models/repo.go
									
									
									
									
									
								
							|  | @ -9,6 +9,7 @@ import ( | |||
| 	"fmt" | ||||
| 	"io/ioutil" | ||||
| 	"os" | ||||
| 	"path" | ||||
| 	"path/filepath" | ||||
| 	"strings" | ||||
| 	"sync" | ||||
|  | @ -24,6 +25,7 @@ import ( | |||
| 	"github.com/gogits/gogs/modules/log" | ||||
| ) | ||||
| 
 | ||||
| // Repository represents a git repository.
 | ||||
| type Repository struct { | ||||
| 	Id          int64 | ||||
| 	OwnerId     int64 `xorm:"unique(s)"` | ||||
|  | @ -63,7 +65,7 @@ func init() { | |||
| 	zip.Verbose = false | ||||
| } | ||||
| 
 | ||||
| // check if repository is exist
 | ||||
| // IsRepositoryExist returns true if the repository with given name under user has already existed.
 | ||||
| func IsRepositoryExist(user *User, repoName string) (bool, error) { | ||||
| 	repo := Repository{OwnerId: user.Id} | ||||
| 	has, err := orm.Where("lower_name = ?", strings.ToLower(repoName)).Get(&repo) | ||||
|  | @ -94,8 +96,8 @@ func CreateRepository(user *User, repoName, desc, repoLang, license string, priv | |||
| 		Private:     private, | ||||
| 	} | ||||
| 
 | ||||
| 	f := RepoPath(user.Name, repoName) | ||||
| 	if err = initRepository(f, user, repo, initReadme, repoLang, license); err != nil { | ||||
| 	repoPath := RepoPath(user.Name, repoName) | ||||
| 	if err = initRepository(repoPath, user, repo, initReadme, repoLang, license); err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	session := orm.NewSession() | ||||
|  | @ -103,9 +105,10 @@ func CreateRepository(user *User, repoName, desc, repoLang, license string, priv | |||
| 	session.Begin() | ||||
| 
 | ||||
| 	if _, err = session.Insert(repo); err != nil { | ||||
| 		if err2 := os.RemoveAll(f); err2 != nil { | ||||
| 		if err2 := os.RemoveAll(repoPath); err2 != nil { | ||||
| 			log.Error("repo.CreateRepository(repo): %v", err) | ||||
| 			return nil, errors.New(fmt.Sprintf( | ||||
| 				"delete repo directory %s/%s failed", user.Name, repoName)) | ||||
| 				"delete repo directory %s/%s failed(1): %v", user.Name, repoName, err2)) | ||||
| 		} | ||||
| 		session.Rollback() | ||||
| 		return nil, err | ||||
|  | @ -118,33 +121,39 @@ func CreateRepository(user *User, repoName, desc, repoLang, license string, priv | |||
| 	} | ||||
| 	if _, err = session.Insert(&access); err != nil { | ||||
| 		session.Rollback() | ||||
| 		if err2 := os.RemoveAll(f); err2 != nil { | ||||
| 		if err2 := os.RemoveAll(repoPath); err2 != nil { | ||||
| 			log.Error("repo.CreateRepository(access): %v", err) | ||||
| 			return nil, errors.New(fmt.Sprintf( | ||||
| 				"delete repo directory %s/%s failed", user.Name, repoName)) | ||||
| 				"delete repo directory %s/%s failed(2): %v", user.Name, repoName, err2)) | ||||
| 		} | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	if _, err = session.Exec("update user set num_repos = num_repos + 1 where id = ?", user.Id); err != nil { | ||||
| 	rawSql := "UPDATE user SET num_repos = num_repos + 1 WHERE id = ?" | ||||
| 	if base.Cfg.MustValue("database", "DB_TYPE") == "postgres" { | ||||
| 		rawSql = "UPDATE \"user\" SET num_repos = num_repos + 1 WHERE id = ?" | ||||
| 	} | ||||
| 	if _, err = session.Exec(rawSql, user.Id); err != nil { | ||||
| 		session.Rollback() | ||||
| 		if err2 := os.RemoveAll(f); err2 != nil { | ||||
| 		if err2 := os.RemoveAll(repoPath); err2 != nil { | ||||
| 			log.Error("repo.CreateRepository(repo count): %v", err) | ||||
| 			return nil, errors.New(fmt.Sprintf( | ||||
| 				"delete repo directory %s/%s failed", user.Name, repoName)) | ||||
| 				"delete repo directory %s/%s failed(3): %v", user.Name, repoName, err2)) | ||||
| 		} | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	if err = session.Commit(); err != nil { | ||||
| 		session.Rollback() | ||||
| 		if err2 := os.RemoveAll(f); err2 != nil { | ||||
| 		if err2 := os.RemoveAll(repoPath); err2 != nil { | ||||
| 			log.Error("repo.CreateRepository(commit): %v", err) | ||||
| 			return nil, errors.New(fmt.Sprintf( | ||||
| 				"delete repo directory %s/%s failed", user.Name, repoName)) | ||||
| 				"delete repo directory %s/%s failed(3): %v", user.Name, repoName, err2)) | ||||
| 		} | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	return repo, NewRepoAction(user, repo) | ||||
| 	return nil, nil | ||||
| } | ||||
| 
 | ||||
| // extractGitBareZip extracts git-bare.zip to repository path.
 | ||||
|  | @ -255,6 +264,7 @@ func initRepository(f string, user *User, repo *Repository, initReadme bool, rep | |||
| 	return nil | ||||
| } | ||||
| 
 | ||||
| // GetRepositoryByName returns the repository by given name under user if exists.
 | ||||
| func GetRepositoryByName(user *User, repoName string) (*Repository, error) { | ||||
| 	repo := &Repository{ | ||||
| 		OwnerId:   user.Id, | ||||
|  | @ -269,6 +279,7 @@ func GetRepositoryByName(user *User, repoName string) (*Repository, error) { | |||
| 	return repo, err | ||||
| } | ||||
| 
 | ||||
| // GetRepositoryById returns the repository by given id if exists.
 | ||||
| func GetRepositoryById(id int64) (repo *Repository, err error) { | ||||
| 	has, err := orm.Id(id).Get(repo) | ||||
| 	if err != nil { | ||||
|  | @ -336,7 +347,11 @@ func DeleteRepository(userId, repoId int64, userName string) (err error) { | |||
| 		session.Rollback() | ||||
| 		return err | ||||
| 	} | ||||
| 	if _, err = session.Exec("update user set num_repos = num_repos - 1 where id = ?", userId); err != nil { | ||||
| 	rawSql := "UPDATE user SET num_repos = num_repos - 1 WHERE id = ?" | ||||
| 	if base.Cfg.MustValue("database", "DB_TYPE") == "postgres" { | ||||
| 		rawSql = "UPDATE \"user\" SET num_repos = num_repos - 1 WHERE id = ?" | ||||
| 	} | ||||
| 	if _, err = session.Exec(rawSql, userId); err != nil { | ||||
| 		session.Rollback() | ||||
| 		return err | ||||
| 	} | ||||
|  | @ -346,8 +361,204 @@ func DeleteRepository(userId, repoId int64, userName string) (err error) { | |||
| 	} | ||||
| 	if err = os.RemoveAll(RepoPath(userName, repo.Name)); err != nil { | ||||
| 		// TODO: log and delete manully
 | ||||
| 		log.Error("delete repo %s/%s failed", userName, repo.Name) | ||||
| 		log.Error("delete repo %s/%s failed: %v", userName, repo.Name, err) | ||||
| 		return err | ||||
| 	} | ||||
| 	return nil | ||||
| } | ||||
| 
 | ||||
| // Commit represents a git commit.
 | ||||
| type Commit struct { | ||||
| 	Author  string | ||||
| 	Email   string | ||||
| 	Date    time.Time | ||||
| 	SHA     string | ||||
| 	Message string | ||||
| } | ||||
| 
 | ||||
| var ( | ||||
| 	ErrRepoFileNotLoaded = fmt.Errorf("repo file not loaded") | ||||
| ) | ||||
| 
 | ||||
| // RepoFile represents a file object in git repository.
 | ||||
| type RepoFile struct { | ||||
| 	*git.TreeEntry | ||||
| 	Path       string | ||||
| 	Message    string | ||||
| 	Created    time.Time | ||||
| 	Size       int64 | ||||
| 	Repo       *git.Repository | ||||
| 	LastCommit string | ||||
| } | ||||
| 
 | ||||
| // LookupBlob returns the content of an object.
 | ||||
| func (file *RepoFile) LookupBlob() (*git.Blob, error) { | ||||
| 	if file.Repo == nil { | ||||
| 		return nil, ErrRepoFileNotLoaded | ||||
| 	} | ||||
| 
 | ||||
| 	return file.Repo.LookupBlob(file.Id) | ||||
| } | ||||
| 
 | ||||
| // GetBranches returns all branches of given repository.
 | ||||
| func GetBranches(userName, reposName string) ([]string, error) { | ||||
| 	repo, err := git.OpenRepository(RepoPath(userName, reposName)) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	refs, err := repo.AllReferences() | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	brs := make([]string, len(refs)) | ||||
| 	for i, ref := range refs { | ||||
| 		brs[i] = ref.Name | ||||
| 	} | ||||
| 	return brs, nil | ||||
| } | ||||
| 
 | ||||
| // GetReposFiles returns a list of file object in given directory of repository.
 | ||||
| func GetReposFiles(userName, reposName, branchName, rpath string) ([]*RepoFile, error) { | ||||
| 	repo, err := git.OpenRepository(RepoPath(userName, reposName)) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	ref, err := repo.LookupReference("refs/heads/" + branchName) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	lastCommit, err := repo.LookupCommit(ref.Oid) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	var repodirs []*RepoFile | ||||
| 	var repofiles []*RepoFile | ||||
| 	lastCommit.Tree.Walk(func(dirname string, entry *git.TreeEntry) int { | ||||
| 		if dirname == rpath { | ||||
| 			size, err := repo.ObjectSize(entry.Id) | ||||
| 			if err != nil { | ||||
| 				return 0 | ||||
| 			} | ||||
| 
 | ||||
| 			var cm = lastCommit | ||||
| 
 | ||||
| 			for { | ||||
| 				if cm.ParentCount() == 0 { | ||||
| 					break | ||||
| 				} else if cm.ParentCount() == 1 { | ||||
| 					pt, _ := repo.SubTree(cm.Parent(0).Tree, dirname) | ||||
| 					if pt == nil { | ||||
| 						break | ||||
| 					} | ||||
| 					pEntry := pt.EntryByName(entry.Name) | ||||
| 					if pEntry == nil || !pEntry.Id.Equal(entry.Id) { | ||||
| 						break | ||||
| 					} else { | ||||
| 						cm = cm.Parent(0) | ||||
| 					} | ||||
| 				} else { | ||||
| 					var emptyCnt = 0 | ||||
| 					var sameIdcnt = 0 | ||||
| 					for i := 0; i < cm.ParentCount(); i++ { | ||||
| 						p := cm.Parent(i) | ||||
| 						pt, _ := repo.SubTree(p.Tree, dirname) | ||||
| 						var pEntry *git.TreeEntry | ||||
| 						if pt != nil { | ||||
| 							pEntry = pt.EntryByName(entry.Name) | ||||
| 						} | ||||
| 
 | ||||
| 						if pEntry == nil { | ||||
| 							if emptyCnt == cm.ParentCount()-1 { | ||||
| 								goto loop | ||||
| 							} else { | ||||
| 								emptyCnt = emptyCnt + 1 | ||||
| 								continue | ||||
| 							} | ||||
| 						} else { | ||||
| 							if !pEntry.Id.Equal(entry.Id) { | ||||
| 								goto loop | ||||
| 							} else { | ||||
| 								if sameIdcnt == cm.ParentCount()-1 { | ||||
| 									// TODO: now follow the first parent commit?
 | ||||
| 									cm = cm.Parent(0) | ||||
| 									break | ||||
| 								} | ||||
| 								sameIdcnt = sameIdcnt + 1 | ||||
| 							} | ||||
| 						} | ||||
| 					} | ||||
| 				} | ||||
| 			} | ||||
| 
 | ||||
| 		loop: | ||||
| 
 | ||||
| 			rp := &RepoFile{ | ||||
| 				entry, | ||||
| 				path.Join(dirname, entry.Name), | ||||
| 				cm.Message(), | ||||
| 				cm.Committer.When, | ||||
| 				size, | ||||
| 				repo, | ||||
| 				cm.Id().String(), | ||||
| 			} | ||||
| 
 | ||||
| 			if entry.IsFile() { | ||||
| 				repofiles = append(repofiles, rp) | ||||
| 			} else if entry.IsDir() { | ||||
| 				repodirs = append(repodirs, rp) | ||||
| 			} | ||||
| 		} | ||||
| 		return 0 | ||||
| 	}) | ||||
| 
 | ||||
| 	return append(repodirs, repofiles...), nil | ||||
| } | ||||
| 
 | ||||
| // GetLastestCommit returns the latest commit of given repository.
 | ||||
| func GetLastestCommit(userName, repoName string) (*Commit, error) { | ||||
| 	stdout, _, err := com.ExecCmd("git", "--git-dir="+RepoPath(userName, repoName), "log", "-1") | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	commit := new(Commit) | ||||
| 	for _, line := range strings.Split(stdout, "\n") { | ||||
| 		if len(line) == 0 { | ||||
| 			continue | ||||
| 		} | ||||
| 		switch { | ||||
| 		case line[0] == 'c': | ||||
| 			commit.SHA = line[7:] | ||||
| 		case line[0] == 'A': | ||||
| 			infos := strings.SplitN(line, " ", 3) | ||||
| 			commit.Author = infos[1] | ||||
| 			commit.Email = infos[2][1 : len(infos[2])-1] | ||||
| 		case line[0] == 'D': | ||||
| 			commit.Date, err = time.Parse("Mon Jan 02 15:04:05 2006 -0700", line[8:]) | ||||
| 			if err != nil { | ||||
| 				return nil, err | ||||
| 			} | ||||
| 		case line[:4] == "    ": | ||||
| 			commit.Message = line[4:] | ||||
| 		} | ||||
| 	} | ||||
| 	return commit, nil | ||||
| } | ||||
| 
 | ||||
| // GetCommits returns all commits of given branch of repository.
 | ||||
| func GetCommits(userName, reposName, branchname string) ([]*git.Commit, error) { | ||||
| 	repo, err := git.OpenRepository(RepoPath(userName, reposName)) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	r, err := repo.LookupReference(fmt.Sprintf("refs/heads/%s", branchname)) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	return r.AllCommits() | ||||
| } | ||||
|  |  | |||
							
								
								
									
										205
									
								
								models/repo2.go
									
									
									
									
									
								
							
							
						
						
									
										205
									
								
								models/repo2.go
									
									
									
									
									
								
							|  | @ -1,205 +0,0 @@ | |||
| // Copyright 2014 The Gogs Authors. All rights reserved.
 | ||||
| // Use of this source code is governed by a MIT-style
 | ||||
| // license that can be found in the LICENSE file.
 | ||||
| 
 | ||||
| package models | ||||
| 
 | ||||
| import ( | ||||
| 	"fmt" | ||||
| 	"path" | ||||
| 	"strings" | ||||
| 	"time" | ||||
| 
 | ||||
| 	"github.com/Unknwon/com" | ||||
| 
 | ||||
| 	"github.com/gogits/git" | ||||
| ) | ||||
| 
 | ||||
| type Commit struct { | ||||
| 	Author  string | ||||
| 	Email   string | ||||
| 	Date    time.Time | ||||
| 	SHA     string | ||||
| 	Message string | ||||
| } | ||||
| 
 | ||||
| var ( | ||||
| 	ErrRepoFileNotLoaded = fmt.Errorf("repo file not loaded") | ||||
| ) | ||||
| 
 | ||||
| type RepoFile struct { | ||||
| 	*git.TreeEntry | ||||
| 	Path       string | ||||
| 	Message    string | ||||
| 	Created    time.Time | ||||
| 	Size       int64 | ||||
| 	Repo       *git.Repository | ||||
| 	LastCommit string | ||||
| } | ||||
| 
 | ||||
| func (file *RepoFile) LookupBlob() (*git.Blob, error) { | ||||
| 	if file.Repo == nil { | ||||
| 		return nil, ErrRepoFileNotLoaded | ||||
| 	} | ||||
| 
 | ||||
| 	return file.Repo.LookupBlob(file.Id) | ||||
| } | ||||
| 
 | ||||
| func GetBranches(userName, reposName string) ([]string, error) { | ||||
| 	repo, err := git.OpenRepository(RepoPath(userName, reposName)) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	refs, err := repo.AllReferences() | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	brs := make([]string, len(refs)) | ||||
| 	for i, ref := range refs { | ||||
| 		brs[i] = ref.Name | ||||
| 	} | ||||
| 	return brs, nil | ||||
| } | ||||
| 
 | ||||
| func GetReposFiles(userName, reposName, branchName, rpath string) ([]*RepoFile, error) { | ||||
| 	repo, err := git.OpenRepository(RepoPath(userName, reposName)) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	ref, err := repo.LookupReference("refs/heads/" + branchName) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	lastCommit, err := repo.LookupCommit(ref.Oid) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	var repodirs []*RepoFile | ||||
| 	var repofiles []*RepoFile | ||||
| 	lastCommit.Tree.Walk(func(dirname string, entry *git.TreeEntry) int { | ||||
| 		if dirname == rpath { | ||||
| 			size, err := repo.ObjectSize(entry.Id) | ||||
| 			if err != nil { | ||||
| 				return 0 | ||||
| 			} | ||||
| 
 | ||||
| 			var cm = lastCommit | ||||
| 
 | ||||
| 			for { | ||||
| 				if cm.ParentCount() == 0 { | ||||
| 					break | ||||
| 				} else if cm.ParentCount() == 1 { | ||||
| 					pt, _ := repo.SubTree(cm.Parent(0).Tree, dirname) | ||||
| 					if pt == nil { | ||||
| 						break | ||||
| 					} | ||||
| 					pEntry := pt.EntryByName(entry.Name) | ||||
| 					if pEntry == nil || !pEntry.Id.Equal(entry.Id) { | ||||
| 						break | ||||
| 					} else { | ||||
| 						cm = cm.Parent(0) | ||||
| 					} | ||||
| 				} else { | ||||
| 					var emptyCnt = 0 | ||||
| 					var sameIdcnt = 0 | ||||
| 					for i := 0; i < cm.ParentCount(); i++ { | ||||
| 						p := cm.Parent(i) | ||||
| 						pt, _ := repo.SubTree(p.Tree, dirname) | ||||
| 						var pEntry *git.TreeEntry | ||||
| 						if pt != nil { | ||||
| 							pEntry = pt.EntryByName(entry.Name) | ||||
| 						} | ||||
| 
 | ||||
| 						if pEntry == nil { | ||||
| 							if emptyCnt == cm.ParentCount()-1 { | ||||
| 								goto loop | ||||
| 							} else { | ||||
| 								emptyCnt = emptyCnt + 1 | ||||
| 								continue | ||||
| 							} | ||||
| 						} else { | ||||
| 							if !pEntry.Id.Equal(entry.Id) { | ||||
| 								goto loop | ||||
| 							} else { | ||||
| 								if sameIdcnt == cm.ParentCount()-1 { | ||||
| 									// TODO: now follow the first parent commit?
 | ||||
| 									cm = cm.Parent(0) | ||||
| 									break | ||||
| 								} | ||||
| 								sameIdcnt = sameIdcnt + 1 | ||||
| 							} | ||||
| 						} | ||||
| 					} | ||||
| 				} | ||||
| 			} | ||||
| 
 | ||||
| 		loop: | ||||
| 
 | ||||
| 			rp := &RepoFile{ | ||||
| 				entry, | ||||
| 				path.Join(dirname, entry.Name), | ||||
| 				cm.Message(), | ||||
| 				cm.Committer.When, | ||||
| 				size, | ||||
| 				repo, | ||||
| 				cm.Id().String(), | ||||
| 			} | ||||
| 
 | ||||
| 			if entry.IsFile() { | ||||
| 				repofiles = append(repofiles, rp) | ||||
| 			} else if entry.IsDir() { | ||||
| 				repodirs = append(repodirs, rp) | ||||
| 			} | ||||
| 		} | ||||
| 		return 0 | ||||
| 	}) | ||||
| 
 | ||||
| 	return append(repodirs, repofiles...), nil | ||||
| } | ||||
| 
 | ||||
| func GetLastestCommit(userName, repoName string) (*Commit, error) { | ||||
| 	stdout, _, err := com.ExecCmd("git", "--git-dir="+RepoPath(userName, repoName), "log", "-1") | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	commit := new(Commit) | ||||
| 	for _, line := range strings.Split(stdout, "\n") { | ||||
| 		if len(line) == 0 { | ||||
| 			continue | ||||
| 		} | ||||
| 		switch { | ||||
| 		case line[0] == 'c': | ||||
| 			commit.SHA = line[7:] | ||||
| 		case line[0] == 'A': | ||||
| 			infos := strings.SplitN(line, " ", 3) | ||||
| 			commit.Author = infos[1] | ||||
| 			commit.Email = infos[2][1 : len(infos[2])-1] | ||||
| 		case line[0] == 'D': | ||||
| 			commit.Date, err = time.Parse("Mon Jan 02 15:04:05 2006 -0700", line[8:]) | ||||
| 			if err != nil { | ||||
| 				return nil, err | ||||
| 			} | ||||
| 		case line[:4] == "    ": | ||||
| 			commit.Message = line[4:] | ||||
| 		} | ||||
| 	} | ||||
| 	return commit, nil | ||||
| } | ||||
| 
 | ||||
| func GetCommits(userName, reposName, branchname string) ([]*git.Commit, error) { | ||||
| 	repo, err := git.OpenRepository(RepoPath(userName, reposName)) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	r, err := repo.LookupReference(fmt.Sprintf("refs/heads/%s", branchname)) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	return r.AllCommits() | ||||
| } | ||||
|  | @ -19,7 +19,9 @@ import ( | |||
| 	"github.com/gogits/gogs/modules/base" | ||||
| ) | ||||
| 
 | ||||
| var UserPasswdSalt string | ||||
| var ( | ||||
| 	UserPasswdSalt string | ||||
| ) | ||||
| 
 | ||||
| func init() { | ||||
| 	UserPasswdSalt = base.Cfg.MustValue("security", "USER_PASSWD_SALT") | ||||
|  | @ -37,7 +39,7 @@ const ( | |||
| 	LT_LDAP | ||||
| ) | ||||
| 
 | ||||
| // A User represents the object of individual and member of organization.
 | ||||
| // User represents the object of individual and member of organization.
 | ||||
| type User struct { | ||||
| 	Id            int64 | ||||
| 	LowerName     string `xorm:"unique not null"` | ||||
|  | @ -58,15 +60,16 @@ type User struct { | |||
| 	Updated       time.Time `xorm:"updated"` | ||||
| } | ||||
| 
 | ||||
| // HomeLink returns the user home page link.
 | ||||
| func (user *User) HomeLink() string { | ||||
| 	return "/user/" + user.LowerName | ||||
| } | ||||
| 
 | ||||
| // AvatarLink returns the user gravatar link.
 | ||||
| func (user *User) AvatarLink() string { | ||||
| 	return "http://1.gravatar.com/avatar/" + user.Avatar | ||||
| } | ||||
| 
 | ||||
| // A Follow represents
 | ||||
| type Follow struct { | ||||
| 	Id       int64 | ||||
| 	UserId   int64     `xorm:"unique(s)"` | ||||
|  | @ -87,6 +90,7 @@ func IsUserExist(name string) (bool, error) { | |||
| 	return orm.Get(&User{LowerName: strings.ToLower(name)}) | ||||
| } | ||||
| 
 | ||||
| // IsEmailUsed returns true if the e-mail has been used.
 | ||||
| func IsEmailUsed(email string) (bool, error) { | ||||
| 	return orm.Get(&User{Email: email}) | ||||
| } | ||||
|  | @ -121,16 +125,12 @@ func RegisterUser(user *User) (err error) { | |||
| 	user.AvatarEmail = user.Email | ||||
| 	if err = user.EncodePasswd(); err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 	if _, err = orm.Insert(user); err != nil { | ||||
| 	} else if _, err = orm.Insert(user); err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 
 | ||||
| 	if err = os.MkdirAll(UserPath(user.Name), os.ModePerm); err != nil { | ||||
| 
 | ||||
| 	} else if err = os.MkdirAll(UserPath(user.Name), os.ModePerm); err != nil { | ||||
| 		if _, err := orm.Id(user.Id).Delete(&User{}); err != nil { | ||||
| 			return errors.New(fmt.Sprintf( | ||||
| 				"both create userpath %s and delete table record faild", user.Name)) | ||||
| 				"both create userpath %s and delete table record faild: %v", user.Name, err)) | ||||
| 		} | ||||
| 		return err | ||||
| 	} | ||||
|  | @ -188,23 +188,28 @@ func (user *User) EncodePasswd() error { | |||
| 	return err | ||||
| } | ||||
| 
 | ||||
| // UserPath returns the path absolute path of user repositories.
 | ||||
| func UserPath(userName string) string { | ||||
| 	return filepath.Join(RepoRootPath, userName) | ||||
| } | ||||
| 
 | ||||
| func GetUserByKeyId(keyId int64) (*User, error) { | ||||
| 	user := new(User) | ||||
| 	has, err := orm.Sql("select a.* from user as a, public_key as b where a.id = b.owner_id and b.id=?", keyId).Get(user) | ||||
| 	rawSql := "SELECT a.* FROM user AS a, public_key AS b WHERE a.id = b.owner_id AND b.id=?" | ||||
| 	if base.Cfg.MustValue("database", "DB_TYPE") == "postgres" { | ||||
| 		rawSql = "SELECT a.* FROM \"user\" AS a, public_key AS b WHERE a.id = b.owner_id AND b.id=?" | ||||
| 	} | ||||
| 	has, err := orm.Sql(rawSql, keyId).Get(user) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	if !has { | ||||
| 	} else if !has { | ||||
| 		err = errors.New("not exist key owner") | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	return user, nil | ||||
| } | ||||
| 
 | ||||
| // GetUserById returns the user object by given id if exists.
 | ||||
| func GetUserById(id int64) (*User, error) { | ||||
| 	user := new(User) | ||||
| 	has, err := orm.Id(id).Get(user) | ||||
|  | @ -217,6 +222,7 @@ func GetUserById(id int64) (*User, error) { | |||
| 	return user, nil | ||||
| } | ||||
| 
 | ||||
| // GetUserByName returns the user object by given name if exists.
 | ||||
| func GetUserByName(name string) (*User, error) { | ||||
| 	if len(name) == 0 { | ||||
| 		return nil, ErrUserNotExist | ||||
|  | @ -227,8 +233,7 @@ func GetUserByName(name string) (*User, error) { | |||
| 	has, err := orm.Get(user) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	if !has { | ||||
| 	} else if !has { | ||||
| 		return nil, ErrUserNotExist | ||||
| 	} | ||||
| 	return user, nil | ||||
|  | @ -242,32 +247,39 @@ func LoginUserPlain(name, passwd string) (*User, error) { | |||
| 	} | ||||
| 
 | ||||
| 	has, err := orm.Get(&user) | ||||
| 	if !has { | ||||
| 		err = ErrUserNotExist | ||||
| 	} | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} else if !has { | ||||
| 		err = ErrUserNotExist | ||||
| 	} | ||||
| 	return &user, nil | ||||
| } | ||||
| 
 | ||||
| // FollowUser marks someone be another's follower.
 | ||||
| func FollowUser(userId int64, followId int64) error { | ||||
| func FollowUser(userId int64, followId int64) (err error) { | ||||
| 	session := orm.NewSession() | ||||
| 	defer session.Close() | ||||
| 	session.Begin() | ||||
| 	_, err := session.Insert(&Follow{UserId: userId, FollowId: followId}) | ||||
| 	if err != nil { | ||||
| 
 | ||||
| 	if _, err = session.Insert(&Follow{UserId: userId, FollowId: followId}); err != nil { | ||||
| 		session.Rollback() | ||||
| 		return err | ||||
| 	} | ||||
| 	_, err = session.Exec("update user set num_followers = num_followers + 1 where id = ?", followId) | ||||
| 	if err != nil { | ||||
| 
 | ||||
| 	rawSql := "UPDATE user SET num_followers = num_followers + 1 WHERE id = ?" | ||||
| 	if base.Cfg.MustValue("database", "DB_TYPE") == "postgres" { | ||||
| 		rawSql = "UPDATE \"user\" SET num_followers = num_followers + 1 WHERE id = ?" | ||||
| 	} | ||||
| 	if _, err = session.Exec(rawSql, followId); err != nil { | ||||
| 		session.Rollback() | ||||
| 		return err | ||||
| 	} | ||||
| 	_, err = session.Exec("update user set num_followings = num_followings + 1 where id = ?", userId) | ||||
| 	if err != nil { | ||||
| 
 | ||||
| 	rawSql = "UPDATE user SET num_followings = num_followings + 1 WHERE id = ?" | ||||
| 	if base.Cfg.MustValue("database", "DB_TYPE") == "postgres" { | ||||
| 		rawSql = "UPDATE \"user\" SET num_followings = num_followings + 1 WHERE id = ?" | ||||
| 	} | ||||
| 	if _, err = session.Exec(rawSql, userId); err != nil { | ||||
| 		session.Rollback() | ||||
| 		return err | ||||
| 	} | ||||
|  | @ -275,22 +287,30 @@ func FollowUser(userId int64, followId int64) error { | |||
| } | ||||
| 
 | ||||
| // UnFollowUser unmarks someone be another's follower.
 | ||||
| func UnFollowUser(userId int64, unFollowId int64) error { | ||||
| func UnFollowUser(userId int64, unFollowId int64) (err error) { | ||||
| 	session := orm.NewSession() | ||||
| 	defer session.Close() | ||||
| 	session.Begin() | ||||
| 	_, err := session.Delete(&Follow{UserId: userId, FollowId: unFollowId}) | ||||
| 	if err != nil { | ||||
| 
 | ||||
| 	if _, err = session.Delete(&Follow{UserId: userId, FollowId: unFollowId}); err != nil { | ||||
| 		session.Rollback() | ||||
| 		return err | ||||
| 	} | ||||
| 	_, err = session.Exec("update user set num_followers = num_followers - 1 where id = ?", unFollowId) | ||||
| 	if err != nil { | ||||
| 
 | ||||
| 	rawSql := "UPDATE user SET num_followers = num_followers - 1 WHERE id = ?" | ||||
| 	if base.Cfg.MustValue("database", "DB_TYPE") == "postgres" { | ||||
| 		rawSql = "UPDATE \"user\" SET num_followers = num_followers - 1 WHERE id = ?" | ||||
| 	} | ||||
| 	if _, err = session.Exec(rawSql, unFollowId); err != nil { | ||||
| 		session.Rollback() | ||||
| 		return err | ||||
| 	} | ||||
| 	_, err = session.Exec("update user set num_followings = num_followings - 1 where id = ?", userId) | ||||
| 	if err != nil { | ||||
| 
 | ||||
| 	rawSql = "UPDATE user SET num_followings = num_followings - 1 WHERE id = ?" | ||||
| 	if base.Cfg.MustValue("database", "DB_TYPE") == "postgres" { | ||||
| 		rawSql = "UPDATE \"user\" SET num_followings = num_followings - 1 WHERE id = ?" | ||||
| 	} | ||||
| 	if _, err = session.Exec(rawSql, userId); err != nil { | ||||
| 		session.Rollback() | ||||
| 		return err | ||||
| 	} | ||||
|  |  | |||
|  | @ -18,6 +18,7 @@ import ( | |||
| 	"github.com/gogits/gogs/modules/log" | ||||
| ) | ||||
| 
 | ||||
| // SignedInId returns the id of signed in user.
 | ||||
| func SignedInId(session sessions.Session) int64 { | ||||
| 	userId := session.Get("userId") | ||||
| 	if userId == nil { | ||||
|  | @ -32,6 +33,7 @@ func SignedInId(session sessions.Session) int64 { | |||
| 	return 0 | ||||
| } | ||||
| 
 | ||||
| // SignedInName returns the name of signed in user.
 | ||||
| func SignedInName(session sessions.Session) string { | ||||
| 	userName := session.Get("userName") | ||||
| 	if userName == nil { | ||||
|  | @ -43,6 +45,7 @@ func SignedInName(session sessions.Session) string { | |||
| 	return "" | ||||
| } | ||||
| 
 | ||||
| // SignedInUser returns the user object of signed user.
 | ||||
| func SignedInUser(session sessions.Session) *models.User { | ||||
| 	id := SignedInId(session) | ||||
| 	if id <= 0 { | ||||
|  | @ -57,6 +60,7 @@ func SignedInUser(session sessions.Session) *models.User { | |||
| 	return user | ||||
| } | ||||
| 
 | ||||
| // IsSignedIn check if any user has signed in.
 | ||||
| func IsSignedIn(session sessions.Session) bool { | ||||
| 	return SignedInId(session) > 0 | ||||
| } | ||||
|  |  | |||
|  | @ -4,8 +4,6 @@ | |||
| 
 | ||||
| package base | ||||
| 
 | ||||
| import () | ||||
| 
 | ||||
| type ( | ||||
| 	// Type TmplData represents data in the templates.
 | ||||
| 	TmplData map[string]interface{} | ||||
|  |  | |||
|  | @ -48,6 +48,7 @@ func init() { | |||
| 		fmt.Printf("Cannot load config file '%s'\n", cfgPath) | ||||
| 		os.Exit(2) | ||||
| 	} | ||||
| 	Cfg.BlockMode = false | ||||
| 
 | ||||
| 	cfgPath = filepath.Join(workDir, "custom/conf/app.ini") | ||||
| 	if com.IsFile(cfgPath) { | ||||
|  |  | |||
|  | @ -8,6 +8,7 @@ import ( | |||
| 	"github.com/codegangsta/martini" | ||||
| ) | ||||
| 
 | ||||
| // SignInRequire requires user to sign in.
 | ||||
| func SignInRequire(redirect bool) martini.Handler { | ||||
| 	return func(ctx *Context) { | ||||
| 		if !ctx.IsSigned { | ||||
|  | @ -19,6 +20,7 @@ func SignInRequire(redirect bool) martini.Handler { | |||
| 	} | ||||
| } | ||||
| 
 | ||||
| // SignOutRequire requires user to sign out.
 | ||||
| func SignOutRequire() martini.Handler { | ||||
| 	return func(ctx *Context) { | ||||
| 		if ctx.IsSigned { | ||||
|  |  | |||
							
								
								
									
										4
									
								
								serve.go
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								serve.go
									
									
									
									
									
								
							|  | @ -1,3 +1,7 @@ | |||
| // Copyright 2014 The Gogs Authors. All rights reserved.
 | ||||
| // Use of this source code is governed by a MIT-style
 | ||||
| // license that can be found in the LICENSE file.
 | ||||
| 
 | ||||
| package main | ||||
| 
 | ||||
| import ( | ||||
|  |  | |||
|  | @ -4,7 +4,7 @@ | |||
|             <div class="collapse navbar-collapse"> | ||||
|                 <ul class="nav navbar-nav"> | ||||
|                     <li class="{{if .IsRepoToolbarSource}}active{{end}}"><a href="/{{.RepositoryLink}}">Source</a></li> | ||||
|                     <li class="{{if .IsRepoToolbarCommits}}active{{end}}"><a href="/{{.RepositoryLink}}/commits">Commits</a></li> | ||||
|                     <li class="{{if .IsRepoToolbarCommits}}active{{end}}"><a href="/{{.RepositoryLink}}/commits/{{.Branchname}}">Commits</a></li> | ||||
|                     <li class="{{if .IsRepoToolbarBranches}}active{{end}}"><a href="/{{.RepositoryLink}}/branches">Branches</a></li> | ||||
|                     <li class="{{if .IsRepoToolbarPulls}}active{{end}}"><a href="/{{.RepositoryLink}}/pulls">Pull Requests</a></li> | ||||
|                     <li class="{{if .IsRepoToolbarIssues}}active{{end}}"><a href="/{{.RepositoryLink}}/issues">Issues <!--<span class="badge">42</span>--></a></li> | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue